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

Change-Id: Ie8b4b02428333be8f5ee6d119e1f2eb192c23a9f