Merge "Follow new type for compile_multilib"