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

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

Change-Id: Ic00d128d3feb9054f94b438f8c22dc9472ed2a4b