Merge "x86_64/x32: Avoid early fail on x32 or x86_64 build"