Forwatd port battery icon option [2/2]

Bring forward the various battery icon options.

Still retains new options for where to show battery percentage text.

Change-Id: I75b3d9f4ba4b4206d2be5f2cd24ceceeae3234fc

Conflicts:
	res/values/cm_arrays.xml
	res/values/cm_strings.xml
	res/xml/status_bar_settings.xml
	src/com/android/settings/cyanogenmod/StatusBarSettings.java

Conflicts:
	src/com/android/settings/simpleaosp/StatusBarSettings.java

Conflicts:
	src/com/android/settings/simpleaosp/StatusBarSettings.java
Disable 'Text only' and 'Hidden' battery icons
Remove cm clear all button [2/2]

Revert "[Settings]: recents panel clear all button tweaks"

This reverts commit ac6b74f131a9406aaf39b54890c67cf8a58556b9.

Conflicts:
	res/values/arrays.xml
	res/values/strings.xml
cm clear all button: Remove it completely
Setting: PA Clear all button
clearallrecents: edit strings
QuickBoot: enable QuickBoot Settings UI

Add QuickBoot enable item in DevelopmentSettings.

Conflicts:
	src/com/android/settings/DevelopmentSettings.java
	res/values-zh-rCN/strings.xml

Conflicts:
src/com/android/settings/DevelopmentSettings.java
Change-Id: I5f86cd1492aea414f0d0c3c4554b933ab5329a51

Conflicts:
	res/xml/development_prefs.xml
	src/com/android/settings/DevelopmentSettings.java
Remove QuickBoot preference if package isn't available

Change-Id: I6f00b6be8d87c1013d2c695d93e66d276017b0a1

Conflicts:
	src/com/android/settings/DevelopmentSettings.java
Settings : Initial slim lockscreen shortcuts

Thanks to slimrom

Change-Id: I0961deac1a30e2938b71a717ad6b7896e1da8bb3

Conflicts:
	res/values/ackdp_arrays.xml
	res/values/rr_attrs.xml
	res/values/rr_strings.xml
	res/xml/rr_main_settings.xml
	res/xml/security_settings_pin.xml
	src/com/android/settings/Settings.java

Conflicts:
	res/values/ackdp_arrays.xml
	res/values/ackdp_attrs.xml
	res/values/ackdp_strings.xml
	res/xml/kangdroid_settings.xml
	res/xml/security_settings_pin.xml