Merge "ASoC: msm: Add support for 4 channel recording" into msm-3.0