am e813a85c: am 2de0771d: Merge "MediaExtractor.setDataSource(...) has always thrown IOExceptions from" into jb-mr2-dev

* commit 'e813a85c97f542bbfc306a30ce2ae4c305133203':
  MediaExtractor.setDataSource(...) has always thrown IOExceptions from