Merge "audio: changes for new audio device enums" into jb-mr1-dev