Merge "mdss: hdmi: Dynamic Audio re-configuration" into msm-3.4