Revert "circle battery bugfixes, margins, per-app-color"

This reverts commit 4719893acc4113ee9bb3e15930899d96e374df43.
Revert "circle battery"

This reverts commit 9f7644f89800426f166d2c36a6275457ad0a32cb.

Conflicts:

	packages/SystemUI/src/com/android/systemui/statusbar/policy/CircleBattery.java
Fix: text only battery