Merge "Make MKV extractor use AMediaFormat"