am c9beb01c: am b9cba9b7: Merge "Move libnbaio out of AudioFlinger" into jb-mr1-dev

* commit 'c9beb01c800e6326051aee52a00659288c25c6eb':
  Move libnbaio out of AudioFlinger