Merge "DO NOT MERGE Improved anti-aliasing for circular display mask" into cw-f-dev am: 2cfae5a656
am: 2d65e23741  -s ours

Change-Id: If872ccb461168d37034900eae7ee16c0882c2771