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

Conflicts:
	src/com/android/settings/cyanogenmod/PerformanceSettings.java

Change-Id: I0b703700da9a4498a2ab3e6e8e005d99f3baeddb