Merge "Fix regression for SoundPool playback" into ics-mr1