Cleanup battery style code

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

Change-Id: Ic56878c26e9a3416149eaaa8a9325d56d664e22e