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

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