am 36c4adf9: am 990615e3: am fcd61bb5: Merge "Fix MediaTimeProvider seek & time drift recovery issue" into klp-dev

* commit '36c4adf9f713602722ebd99c4b44137f6240fca7':
  Fix MediaTimeProvider seek & time drift recovery issue