Merge "Allow MediaExtractor to create FileSource" into oc-dev
am: fd1c19c3a7

Change-Id: Ied59190ff8832581e8fa82721bb29fa26065b82e