Merge "libstagefright_mpeg2support: Remove libmedia_headers dependency" am:...

Merge "libstagefright_mpeg2support: Remove libmedia_headers dependency" am: 04a97b43 am: 6bb971ef am: c953348b am: 4bcb19b8 am: cbe1d934

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

Change-Id: If735ea62f4872ad24bf0f7fac52919bb15d84162