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

Change-Id: Ib73918d552325177839fec55b9a590d60604ad32