Merge "Allow directly setting a DataSource for NuMediaExtractor" into jb-mr1-dev