Merge "Merge "Identity: Statically link VTS test binary." into rvc-dev am: bde68f5a1d am: ec14eb63af" into rvc-d1-dev-plus-aosp