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

Change-Id: I216a22c9edbae150507f49ec5f5a66d536992487