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