am b1f65358: am 5ad17493: Merge "Support .asm being compiled by yasm targeted for x86."

* commit 'b1f65358a8af7548dfb02de281b081fc356881b4':
  Support .asm being compiled by yasm targeted for x86.