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

* commit 'a2e72b6c3ba31a0c54e0207df4f94edba52d5a4f':
  Use macros to remove CFI information for MAC OS/X