Revert "[Squashed]Chameleon Engine"

This reverts commit b611cd756a086db7c1834510c20dd05c9c79cc72.
fb: fix qs battery tile on normal icon due of left over
Frameworks: Forward Port Circle Battery and Landscape Battery (2/2)

removed Slims battery options

Thanks to:
@Sven-Dawitz
@jruesga
@mikeNG

Conflicts:
	core/java/android/provider/Settings.java
	packages/SettingsProvider/res/values/defaults.xml
	packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
	packages/SystemUI/res/layout/quick_settings_tile_battery.xml
	packages/SystemUI/res/values/mahdi_arrays.xml
	packages/SystemUI/res/values/mahdi_attrs.xml
	packages/SystemUI/res/values/mahdi_dimens.xml
	packages/SystemUI/res/values/mahdi_strings.xml
	packages/SystemUI/res/values/styles.xml
	packages/SystemUI/src/com/android/systemui/BatteryCircleMeterView.java
	packages/SystemUI/src/com/android/systemui/BatteryMeterView.java
	packages/SystemUI/src/com/android/systemui/quicksettings/BatteryTile.java
	packages/SystemUI/src/com/android/systemui/statusbar/halo/HaloProperties.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarTransitions.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsModel.java