am 69551d85: Merge change 23557 into eclair

Merge commit '69551d85e95d2ba712f083b39f3ff0b32f865e34' into eclair-plus-aosp

* commit '69551d85e95d2ba712f083b39f3ff0b32f865e34':
  init: add some more audio devices