am 457e8258: Merge "MediaSync: map returned output buffers to previously...
am 457e8258: Merge "MediaSync: map returned output buffers to previously received input buffers." into mnc-dev
* commit '457e8258':
MediaSync: map returned output buffers to previously received input buffers.