am 684e0ae8: am 9a98b6de: Merge "Partial fix for SoundPool not terminating" into klp-dev

* commit '684e0ae8ac8cfb7c7a9709a7b4fc6caf485dfb8a':
  Partial fix for SoundPool not terminating