Merge "audio: added support for multichannel over HDMI" into jb-mr1-dev