Merge "ASoC: msm: qdsp6v2: Fix MI2S channel mapping"