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

Conflicts:
	overlay/frameworks/base/core/res/res/values/config.xml
Merge branch 'kitkat' of https://github.com/alteredlikeness/android_device_motorola_omap4-common into kitkat