Merge "MediaExtractor: clarify EOS behavior for local files" into nyc-mr1-dev
am: 3b82056fca

Change-Id: I41f69d7b90b26163ae950e05b0e0ef9407d8bc80