[automerger skipped] Merge "Fix vendor modules to use shared vndk" am: ed2b8f2314 am: b0a51cdcff -s ours

am skip reason: Change-Id Iaf6029ca4ded12b1b7a04a59b26fda33dcb3d071 with SHA-1 9c8792bd87 is in history

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

Change-Id: Ie72152f270419f78fdef7c9cb27ba28f06444899