Merge "Remove round rect clipping optimization." into oc-dev am: 190fe086df
am: c421f748a9

Change-Id: I6fe0b0eabb2ad17a7dd6df8c695029f36f8b3cd6