Merge "Allow building .asm files for x86_64 as well"