Merge "Don't crash when presented with non-roundRect clipping outline." into oc-dev am: 2b81530bd2
am: 86c40b5099

Change-Id: Ia5b5fb05cc1eb6d04396bf599617ed6bca40e748