Merge "audioflinger: fix audio skipping over A2DP" into ics-mr1