Merge "Build changes to build multilib tests"