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

* commit '8a6dbce54b814b453eb8ff4d86257c5770918f7e':
  Fix race in AudioTrack destruction