am 2e9a1faf: Merge "Tidy x86 assembler."

* commit '2e9a1faf6a89d464f4f95dd60008a3ccf4a62b76':
  Tidy x86 assembler.