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

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

Change-Id: Id1c21e3a88a7c15f592ffcf38830b69e1df70e32