am 1fbb83b6: am 85396642: Merge "audioflinger: changes for new audio devices enums" into jb-mr1-dev

* commit '1fbb83b665720f2629d7a3759a0a7b61b4f04571':
  audioflinger: changes for new audio devices enums