Remove new styles from AOSP am: 9bc73333b0 am: 5d22d2d3ef

Change-Id: I56aa705df08a40efc5bad74ce4ec3fb62be46d76