Merge "audioflinger: fix noise when skipping to next song" into ics-mr1