am 9405746d: Merge "Rename --include-cfi to --generate-debug-info."

* commit '9405746db73609d8c7bd30ceafbed2ebe468e4d3':
  Rename --include-cfi to --generate-debug-info.