am eaa08d35: am 2a0d685e: Merge "MediaPlayerService: fix AudioSink latency" into ics-mr1

* commit 'eaa08d35154b0b9d62098c80c75f2deeadf72b9e':