Remove new styles from AOSP am: aff58cef5c am: 92da5d93fa

Change-Id: If91e215c81820c762539db8251cff8e0886434f3