CM sync

Conflicts:
	AOSP_JB_MR2-3.4/charger
	AOSP_JB_MR2-3.4/default.prop
	AOSP_JB_MR2-3.4/fstab.qcom
	AOSP_JB_MR2-3.4/init
	AOSP_JB_MR2-3.4/sepolicy