Merge "SoundPool: add lock for findSample access from SoundPoolThread"