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

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