am 2552402f: am 69551d85: Merge change 23557 into eclair

Merge commit '2552402f9a4d1a58a95c021a814cc146221df687'

* commit '2552402f9a4d1a58a95c021a814cc146221df687':
  init: add some more audio devices