Revert "Status bar: Clock styles, (1/2):"

This reverts commit dfb1cc34fa5ad27f68b79f82aa2012653804f961.

Conflicts:
	core/java/android/provider/Settings.java
Merge branch 'lp-caf' of https://github.com/BrokenOs/frameworks_base into lp-caf

Conflicts:
	core/java/android/provider/Settings.java