Revert "Status bar battery icon style"

This reverts commit 48db5afb62b78e59fc269a5f5afd7493b30a7479.
CircleBatteryMod (framework part): ERROR

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryController.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/CircleBattery.java