Revert "Forward port circle battery."

This reverts commit 2903f9159e076261f1eaedd11d1dc4314dd5cee7.

Conflicts:
	packages/SystemUI/res/layout/status_bar.xml
	packages/SystemUI/res/values/styles.xml
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java