am c4218db6: am ff1da43f: am 91421141: Merge "media: use proper input timestamp in VideoEncoderDecoderTest" into klp-dev

* commit 'c4218db6c59caacbe5ecef1ca53cf48e289d1b61':
  media: use proper input timestamp in VideoEncoderDecoderTest