Merge "Revert "Revert "media: Globaly adjust timestamp to make sure all tracks' time are align""" into oc-dr1-dev
am: 6ec18f8ce3

Change-Id: I96911274a6f52809a2750a127b355cf99bf947ed