Percent Battery: Clean up

Conflicts:
	packages/SystemUI/res/layout/status_bar.xml
	packages/SystemUI/res/values/colors.xml
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java