Merge "AudioAttributes: note that AAudio.h should sync"