Merge "MPEG4Writer: fix diff between duration and timestamps" into oc-dr1-dev
am: fb8c3c5111

Change-Id: I871772f7818e5738620a949faabceec7a8c7750a