Merge "stagefright: limit audio gap for looped playback" into ics-mr1