Merge "Revert "media: Globaly adjust timestamp to make sure all tracks' time...
Merge "Revert "media: Globaly adjust timestamp to make sure all tracks' time are align"" into oc-dr1-dev am: 5f1b1e7c
am: 27ee1373
Change-Id: I5685dd9c1cb773ef28c22da2b857b7abf571998f