Remove new styles from AOSP am: aff58cef5c

Change-Id: I7efe65fe36aec54a2b5d4435377e255cb9d58074