Merge change 9340 into donut

* changes:
  Fix issue 2025872: Deadlock in SoundPool.stop