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

* commit '6ae0468269dfd30fb22a1eb99417261c6c06d665':
  audio: Fix race condition in AudioTrack underrun.