Merge "Fix sign extension issues in x86_64 code generation"