Revert "status bar: native battery percentage"

This reverts commit 7ea94c8ee80e4c52ebce156f93045da209b0d624.

Conflicts:
	core/java/android/provider/Settings.java
Revert "status bar: AM/PM - show/hide clock"

This reverts commit 16f8385621d3cd21432d5fcc472fec3c704e37cc.

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