Merge "Change mask path to only use cubicTo notation so that isConvex is...
Merge "Change mask path to only use cubicTo notation so that isConvex is always true. Bug: 37100106" into oc-dev am: f9f8120e
am: 34a50ae5
Change-Id: Ib219189920f2604c0a463860eb21b82a5e6507a5