am 85583753: Merge "Fix braino in x64 assembler."

* commit '8558375377946aabbbda6ab584e13f754590bd89':
  Fix braino in x64 assembler.