Merge "Fix x86_64 assembly file generation."