Merge "disable Krait for Mac builds to avoid assembler issues"