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

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

Change-Id: Ia764a07b513e0eaa64f5c69cfb1bc2456136fad8