Merge "Use compile_multilib: "both" for MTS" into main