am cad53f2d: Merge "Fix x86 and x86_64 assembly generation"

* commit 'cad53f2dbfd09d2ed441342a7f2f69530cb4622e':
  Fix x86 and x86_64 assembly generation