Merge "DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread" into lmp-dev am: 0c4d693722 am: ba49fda63a  -s ours am: bb1809ace7
am: adfda28b42

* commit 'adfda28b4211812737fd7a6d7b9729dbef35be93':
  DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread