Merge "media: Adjust the first video/audio sample time in slow motion." into nyc-mr2-dev
am: ce43e0f6b9

Change-Id: I952308a69edf8dde70597c1ec6df8f437cdd73a5