Merge "libstagefright_mpeg2support: Remove libmedia_headers dependency" am: 04a97b439b am: 6bb971efd7 am: c953348bfc am: 4bcb19b8f2

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

Change-Id: Id85e391817270fbda5b31fc678ec125c9ecd9a25