merge from cm10.1
merge snd_soc_msm_2x for audio-caf