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

* commit '730c0f6591b1c99699e9d0ecf36d696f7d87629f':
  Fix stencil mask usage in HWUI