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

Change-Id: I7b457216863872d7287e777097e04f99d2f18326