am a2ba36e0: Merge "Add --include-cfi compiler option."

* commit 'a2ba36e0e617a02c0d5509699fa5386acb297065':
  Add --include-cfi compiler option.