[WIP] Cleanup battery style code (PS:4)

* Cleanup commented out code
* Fix landscape battery icon padding
* Fix circle battery frame color on some black backgrounds

Change-Id: Ic56878c26e9a3416149eaaa8a9325d56d664e22e

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java