Merge "Fix x86 and x86_64 assembly generation"