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

* commit '2b7f91b932be0aa9ce6fa3acda9ff439e94643fc':
  Fix regression for SoundPool playback
tree: cf6832c7d73a0ecf7237880dc2401ce5f4738fc9
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/