Merge "ASoC: 8930: add multi channel support for hdmi" into msm-3.4