Merge "ASoC: msm: Add routing control to route voice to HDMI" into msm-3.4