Merge "audio: Fix race condition in AudioTrack underrun." into nyc-dev