am 6bb41928: am c8400a3e: Merge "Add --include-cfi compiler option."

* commit '6bb41928e4fe2673a036a4bfa1625c5598cf14f1':
  Add --include-cfi compiler option.