Merge "Replace the shared lib dependency to libmedia with header deps" am: ec49ef405b am: 5396aa0d1d am: 13362eb240

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

Change-Id: Iec45f4321592c8fd334bf3c745cce088ca1a44f9