fix up mismerge & qcom-common change
	modified:   BoardConfigCommon.mk
	modified:   common-proprietary-files.txt
	modified:   config/snd_soc_msm_2x
	modified:   msm8960.mk