Merge "Optimised hwui rounded corners shader" am: d7287c96eb
am: ed7bdd6549

Change-Id: I6acba9bd707a3beec41439cd86cce4cdea6d8b69