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

Conflicts:
	CHANGELOG.mkdn
	CONTRIBUTORS.mkdn
	config/common.mk
	config/common_full.mk
	config/telephony.mk
	overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
	prebuilt/common/bin/backuptool.functions
	prebuilt/common/bin/backuptool.sh
	prebuilt/common/etc/apns-conf-cdma.xml
	sepolicy/sepolicy.mk