am cc598b2b: am 05985a2e: am c15cf3d2: Merge "stagefright: limit audio gap for looped playback" into ics-mr1

* commit 'cc598b2b8b78df6576ac3c653daca82699625218':
  stagefright: limit audio gap for looped playback