Remove new styles from AOSP am: 9bc73333b0

Change-Id: I7fda30eb7ba4450dd524ff2e4084e562335eab03