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

* commit '85396642425b94ec33aa26f27e109353e3516ec4':
  audioflinger: changes for new audio devices enums