Merge "MediaPlayerService: fix AudioSink latency" into ics-mr1