Merge "Move libnbaio out of AudioFlinger" into jb-mr1-dev