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

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