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

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