Merge "MediaExtractor.setDataSource(...) has always thrown IOExceptions from" into jb-mr2-dev