Revert "Statusbar battery icons"

This reverts commit bea732a93285dee0db50c4ec817006c9453007a1.

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