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

Change-Id: I9d701444957cae9395f23537df63a76498ede87b