am 2b7f91b9: Merge "Fix regression for SoundPool playback" into ics-mr1

* commit '2b7f91b932be0aa9ce6fa3acda9ff439e94643fc':
  Fix regression for SoundPool playback