Merge "ASoC: msm: Fixup of the SEC I2S port to 2 channels" into msm-3.4