Merge "SoundPool: Refactor class"