Merge "Support staticlib and cdylib from metadata." into main am: 6c4aa89623 am: f43b89f48e am: 9b45917336

Original change: https://android-review.googlesource.com/c/platform/development/+/2832838

Change-Id: Ic0d4ac5d62960b91af55aedade45b85b9ed44c08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>