Merge "Convert libaaudio to Android.bp" into oc-mr1-dev-plus-aosp