Merge "Convert MP3Extractor to use AMediaFormat"