Remove new styles from AOSP am: f2971b3b02 am: f65152f0f6 am: 2ce8759373 am: 933b10e3c6

Change-Id: I0fd23904ab2050c8afb1ed45531190714461a529