Merge "Fix stencil mask usage in HWUI" into mnc-dev