Revert "fb: add Battery Styles the new way 1/2"

This reverts commit b3d12ea48fc2af37ba6e73f7b49cb241d3f164d8.

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