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

Change-Id: I9da0d02131eefdb38b6025d4cdc6fb27ab3c82f2