Merge "Add x86_64 code generation support"