Merge "x86_64: Unify 64-bit check in x86 compiler"