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

Change-Id: I0a1903f18219da2138ddbdb5d8e5e6170f388495