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