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

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