Merge "SoundPool: Fix clang-tidy"