Merge "Remove /vendor/lib[64]/extractors from MediaExtractorFactory" am: 7b95c4c042
am: 649ac89590

Change-Id: I9fe793962e6e340d5b2a99c53b28978ff05a482e