Merge "libmpeg2extractor : Remove libmedia_headers dependency" am: 6f01fb530c

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1336078

Change-Id: I5dd55fd2cb76313e705eaf31e269117e865a7bec