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

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

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