am 943917c4: (-s ours) Merge "Fix SoundPool.play() looping regression in 4.3 DO NOT MERGE"

* commit '943917c41f447fdceab6ce75e00c05551072000b':
  Fix SoundPool.play() looping regression in 4.3 DO NOT MERGE