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