Merge "Allow x86+arm multilib build."