Merge "Optimised hwui rounded corners shader"
am: d7287c96eb

Change-Id: Idf53faac924be91d4e23da91b54c9ca08be9ad39