am 79a4e2ef: am 89ef58f4: Merge "audio policy: fix scanning of supported devices" into jb-mr1-dev

* commit '79a4e2efc502979c21ebbc164691d61b1634362a':
  audio policy: fix scanning of supported devices