Merge "libaaudio: changes for API council"