Merge "Fix vendor modules to use shared vndk" am: ed2b8f2314

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

Change-Id: I051cf56a1213d777af5e7d44c3019d0e5380e72c