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

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