Merge "Use static libraries for multilib VTS" into main