[automerger skipped] Merge "Fix vendor modules to use shared vndk" am:...

[automerger skipped] Merge "Fix vendor modules to use shared vndk" am: ed2b8f23 am: b0a51cdc -s ours am: d4de218e -s ours am: 1b6c7cc7 -s ours am: 07b630bf -s ours

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

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

Change-Id: I38bfb8813ae9798c50d863acda6d50aaa28a10f3