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

Change-Id: I202c658210f45238913bd7de8be7d1862fea05a4