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

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

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