Merge "Fix Mac build: Don't use the CFI directives on Mac"