Remove new styles from AOSP

Fixes: 156779458
Test: manually check styles
Change-Id: Idab27fe12f0daad6ffe6587967d1e25ff2f5c238
14 files changed