Merge "Convert AACExtractor to use AMediaFormat"