am c180dd0b: Merge "Revert "disable Krait for Mac builds to avoid assembler issues""

* commit 'c180dd0bfc55ae222f143dc86a333caf000cbf03':
  Revert "disable Krait for Mac builds to avoid assembler issues"