Revert "Battery text mode (2/2)"

This reverts commit 506eb056673f7261f1a52736d67037ba1101d748.

Conflicts:
	res/values/bliss_strings.xml
	res/values/cm_strings.xml
	res/xml/status_bar_settings.xml

Change-Id: Id80a60d773c0f3b571af1c925fd8d1400e16457c