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

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

Change-Id: Ie15f50a2db4d4b3bf79af3ec7f8a6f751e07034b