Remove new styles from AOSP am: ec4d8a9ca6 am: b28d877934

Change-Id: Ie0dfaa01b06cdd9ac550bdf958427bdfadbcfc0c