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

Conflicts:
	rootdir/etc/fstab.qcom
	rootdir/etc/init.carrier.rc

Change-Id: I4b3d7d4149e355c13b182b4004b83f25a18f6935