Revert "Bring in CMs 3 real Circle battery && also circle dotted battery [1/2]"

This reverts commit 158c26b7c0bdd467019ec02163e0f05c32f1d6cb.

Conflicts:

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

Change-Id: I07a7dd57c0fe2a7131651e196a4cc36b6b70ab86