Cyanogen Circle Battery - Thanks CyanogenMod (1/2)

Change-Id: I9e03d0c40967ec79024a2bd66c19ed7354028d34

Conflicts:

	packages/SystemUI/src/com/android/systemui/statusbar/policy/CircleBattery.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/SbBatteryController.java