Merge "Support x86+arm multilib build."