am 13e2fdfa: am b73232f0: Merge "Disable x86 assembly on darwin"

* commit '13e2fdfa8c689a3f6e3fc5d2c8c3cea9c85c0387':
  Disable x86 assembly on darwin