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

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

Change-Id: Ie1e9a0f0da33ae3a3e5b3d6b656719496d0c504d