Merge "libaaudio: API changes requested by council"