DO NOT MERGE Improved anti-aliasing for circular display mask am: c84731ae3b
am: 2c3c928ad9  -s ours

Change-Id: I96a652a5ca3f1372cfa94d07d1973d5e9fc689cb