Remove new styles from AOSP am: f2971b3b02 am: f65152f0f6

Change-Id: If8fb698a2f04775f41defa6628bc83d06fcc3796