Merge "Asoc: msm: 8064: Set channel number based on recording mode" into msm-3.4