Merge "Support .asm being compiled by yasm targeted for x86."