Fix merge conflicts from cherry-pick for hdmi audio.