am 3944e33a: am ff3f75c3: Merge "Allow directly setting a DataSource for...
am 3944e33a: am ff3f75c3: Merge "Allow directly setting a DataSource for NuMediaExtractor" into jb-mr1-dev
* commit '3944e33a':
Allow directly setting a DataSource for NuMediaExtractor