Merge "Reset mExtractorInput on end of file" into rvc-dev