Merge "MP3Extractor: return EOS code correctly"