am aaf2d266: am 569737c6: Merge "Add USB out_get_presentation_position() for timestamps" into mnc-dev

* commit 'aaf2d266f14adffdc6d77f2eb1bd30c43999b923':
  Add USB out_get_presentation_position() for timestamps