Rebase Clock Styles to AOKP's

Change-Id: I3547b8604ad1052486dfc403b4f5c7911b409705

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/res/layout/status_bar.xml
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/ClockCenter.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/ClockStock.java
Minor fix.
A few fixups.