Merge "Make rounded corners handle color inversion" into oc-dr1-dev am: ca91e6cecd
am: dafbdf9feb

Change-Id: Ia5d7f87cc5160f9bc9eeb13b4bca3f0fc1f21339