Revert "Move status bar native battery percentage into status bar battery style"

This reverts commit 3799713f39a93f8969e5b98c971282dab5fc6855.

Conflicts:
	src/com/android/settings/rascarlo/StatusBarSettings.java
Revert "Circle Battery"

This reverts commit d7bf4e182d35f05b5ed164174d73fa53a5a2c5ad.

Conflicts:
	res/values/ras_strings.xml
	res/xml/status_bar_settings.xml
	src/com/android/settings/rascarlo/StatusBarSettings.java
Revert "Status bar native battery percentage"

This reverts commit 949b484aafdbda306d51d3ade528ff6646269018.

Conflicts:
	res/values/ras_strings.xml
	res/xml/status_bar_settings.xml
	src/com/android/settings/rascarlo/StatusBarSettings.java
	src/com/android/settings/rascarlo/SystemSettings.java