Revert "[2/2] Navbar height"
Revert "Statusbar Battery - much credit, respect, and love to @CyanogenMod"

This reverts commit 903abb58f4f331818cd17ece2bbc8fa03d129d3f.

Conflicts:
	res/values/cfx_strings.xml
	res/xml/statusbar_settings.xml
	src/com/android/settings/cfx/StatusbarSettings.java