Merge "Optimised hwui rounded corners shader" am: d7287c96eb am: ed7bdd6549 am: 92ef0a59f8
am: 11e44273dc

Change-Id: Iad6d7763cb5e1d4524b7a4a48fec333f90a597e5