Merge "libstagefright_mpeg2support: Remove libmedia_headers dependency" am: 04a97b439b

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

Change-Id: I66244dcc2dbcaa177a9ec8a0fca03ced8733f12c