DO NOT MERGE Improved anti-aliasing for circular display mask
am: c84731ae3b

Change-Id: I64484d947636fc5b4ed43e13a3dc096ac1bb6fe1