am 3b78a249: (-s ours) am 569737c6: Merge "Add USB out_get_presentation_position() for timestamps" into mnc-dev

* commit '3b78a2497fef8d6620c64993eaf075b8c547c8de':