Merge remote-tracking branch 'cm/cm-11.0' into HEAD

Conflicts:
	res/xml/settings_headers.xml
	src/com/android/settings/Settings.java
	src/com/android/settings/cyanogenmod/PerformanceSettings.java

Change-Id: I6730183faf8303f9b72afc8d95fa63e6349ee8be