Merge "Convert MidiExtractor to use AMediaFormat"