Merge "audio: new audio devices enums" into jb-mr1-dev