am b73232f0: Merge "Disable x86 assembly on darwin"

* commit 'b73232f04f56fed92f24a07604e8b0cc2d686245':
  Disable x86 assembly on darwin