Merge "Add --include-cfi compiler option."