Remove new styles from AOSP am: ec4d8a9ca6 am: b28d877934 am: 4f7dae4db0

Change-Id: Id8d503d89ca75c2c55fc08b1cae07a5deef39db6