Merge "Add a 32-bit x86_64 arch variant"