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

Change-Id: I8c477bbb1fb0b1176947a379cc74f9528cd01152