Merge "Revert "Revert "SoundPool: Use caller thread for sound playback"""