Revert "Revert "Fix build error for battery icon""

This reverts commit d78324daa3f7cfcf4ed2a9de4dc37c47fefd8645.

Conflicts:
	packages/SystemUI/res/layout/status_bar.xml
	packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryController.java
Revert "Revert "Test for new battery icon for status bar""

This reverts commit 6cbcf2b69ed11f705d832da6c336e760e815c520.

Conflicts:
	packages/SystemUI/res/layout/status_bar.xml
	packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryController.java