Merge "Miscellaneous fixes to SoundPool unit test" into klp-dev