am 7dfb1d99: am 730c0f65: Merge "Fix stencil mask usage in HWUI" into mnc-dev

* commit '7dfb1d9931fb67ae598be091425b03ded1e16eaa':
  Fix stencil mask usage in HWUI