Status bar battery icon style

Conflicts:
	core/java/android/provider/Settings.java

Conflicts:
	core/java/android/provider/Settings.java
Status bar battery: swap icon and percentage
Use less padding