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