am c30ccfc1: am 2e9a1faf: Merge "Tidy x86 assembler."

* commit 'c30ccfc1499a821ad1bdb2dfc0b4bd310a09a765':
  Tidy x86 assembler.