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

* commit '086b804d95bd1f85dfb126fafa7e3d8e5c72211c':
  Add --include-cfi compiler option.