Remove new styles from AOSP am: 9bc73333b0 am: 3c029a1358

Change-Id: I29b38c97a6d959101e9bee82579a83d9c69434b1