Revert "Hide the AM/PM preference completely if using a 24-hour clock"

This reverts commit d1f1fb4064bfcef528a12a4c5176df7b44ffd48c.
Revert "Forward port Status Bar settings"

This reverts commit c0973892366407ad5b4129ddd59530f098673dce.

Conflicts:
	res/values/arrays.xml
	res/values/strings.xml
	res/xml/status_bar.xml
	res/xml/system_settings.xml
	src/com/android/settings/cyanogenmod/StatusBar.java