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 am: 569d39f94a  -s ours am: 975bb62996 am: b51610971c am: 047cfaf95a am: 3abe346ed2
am: ffa5d53049  -s ours

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