Merge "Remove new styles from AOSP" into rvc-d1-dev am: dbe16101a5

Change-Id: Idaa838376e581f37c30cb6d3ace8cb73d72dd99d