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

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

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