am 25e23605: am 73e7f49f: am cad53f2d: Merge "Fix x86 and x86_64 assembly generation"

* commit '25e236052d1423217ff8b5956f15fb4eaa2bac34':
  Fix x86 and x86_64 assembly generation