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