am 428a59d9: Merge "Fix race in AudioTrack destruction" into jb-dev

* commit '428a59d9f6deb548f46151e7c7962aa204f13cf0':
  Fix race in AudioTrack destruction