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

Change-Id: I7148f4a9262f2dfd7a0f604cb3241e0a0cefa525