Merge "Statically link libbase for mainline module tests" into main