KeyGuard: fixed strings warnings

Change-Id: I53047334512de40e64b01f1824861fb3c804eedd

Conflicts:
	packages/Keyguard/res/values/cm_strings.xml
core: Fix typos in AOSP EN resources

Change-Id: I40220888c2fbe87629d17fc52046e554388de3ee
Forward port battery icon options [1/2]

Bring forward the various battery icon options.
Portrait, Landscape, Circle, Text.

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

Change-Id: Icfc14d989eebde9014538291c24aa76d328df234

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/src/com/android/systemui/BatteryLevelTextView.java
	packages/SystemUI/src/com/android/systemui/BatteryMeterView.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
[Base]: recents panel clear all button tweaks

- Show or hide recents button
- Place the button in top right or left

@cristianomatos

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

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java