Revert "Unbreak the public API again..."

This reverts commit 03cd67656ec9797eb8d9938c9c3fbb4aabcd82f1.
Revert "Fix charging indication."

This reverts commit 5d3fe36b5f661e3c0b5973f3ea875297a26a9c1f.
Revert "systemui: Use the same color for circle battery than clock color"

This reverts commit 39c8d1565dce9b902ebd226ff4cd544c89c23553.
Revert "systemui: fix circle battery percentage alignment for low dpi devices"

This reverts commit 624d877d751edd2a022fefb9b708887e881f8aa8.
Revert "systemui: Fix hidden battery icon style"

This reverts commit e0e8d6be9ead1bceca36d26682e9cc5d766df29b.
Revert "SystemUI: Allow theming battery via theme chooser"

This reverts commit e58d5b0b5ab5b00f3ea229299f780434ed4b74f6.
Revert "BatteryService: Restore the original parcel order"

This reverts commit b0fde04f862349e2a2166a48d534035b52ea3fdf.
Revert "BatteryService: fix FC on boot until battery stat is present"

This reverts commit e3fb8ddeb31523b6729479bb46f7dfa2add97ac7.
Revert "base: Add dock battery support"

This reverts commit fafcb823ab8bc111e72ed108259ba8aa85dee4f0.

Conflicts:
	core/res/res/values/cm_strings.xml
	packages/SystemUI/res/values/cm_strings.xml
	packages/SystemUI/src/com/android/systemui/DockBatteryMeterView.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryController.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/DockBatteryController.java

Change-Id: Ib8e99425883377f01c65abec28fca1154d5f7b9a