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 am: bb1809ac
am: adfda28b
* commit 'adfda28b':
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread