Merge remote-tracking branch 'github/cm-10.2' into cm-10.2-dev

Conflicts:
	BoardConfigCommon.mk
	common-proprietary-files.txt
	config/snd_soc_msm_2x
	extract-files.sh
	include/hardware/gps.h
	msm8960.mk
	rootdir/Android.mk
	rootdir/etc/fstab.qcom
	rootdir/etc/init.qcom.mdm_links.sh
	rootdir/etc/init.qcom.post_boot.sh
	rootdir/etc/init.qcom.rc
	rootdir/etc/init.qcom.sh
	rootdir/etc/init.qcom.syspart_fixup.sh
	rootdir/etc/init.target.rc
	rootdir/etc/ueventd.qcom.rc
	setup-makefiles.sh

Change-Id: Ic311ca2c8cfbe3fc356c5766892c82848856b879