Merge "Use macros to remove CFI information for MAC OS/X"