am 0a1f3fb1: Merge "Fix x86_64 assembly file generation."

* commit '0a1f3fb1f666cc0eed4ded942e811fdd1c58470b':
  Fix x86_64 assembly file generation.