Merge "DO NOT MERGE SoundPool: add lock for findSample access from...
Merge "DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread" into lmp-dev am: 0c4d6937
am: ba49fda6 -s ours
* commit 'ba49fda6':
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread