am e3e639b1: am ac1a450a: Merge "Don\'t attempt to seek audio and video separately." into jb-mr1-dev

* commit 'e3e639b1714d35628f9b75276839ad55d8afc74c':
  Don't attempt to seek audio and video separately.