Merge "Use static libraries for multilib VTS" into main am: 6a034e0160 am: 3a39c821af

Original change: https://android-review.googlesource.com/c/platform/system/security/+/3248696

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