Merge "Replace --include-cfi with --generate-debug-info." into mnc-dev