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

Change-Id: I5d977739b936fb6796ae90b1208655536a32fa1b