Merge remote-tracking branch 'upstream/cm-11.0' into ose

Conflicts:
	AndroidManifest.xml
	res/values/cm_arrays.xml
	res/values/cm_strings.xml
	res/values/strings.xml
	src/com/android/settings/DevelopmentSettings.java
	src/com/android/settings/SecuritySettings.java