am 2edc211c: am 023e6f6d: Merge "Add --generate-debug-info flag and remove the other two flags."

* commit '2edc211c4520ea5d9219372554adbc3822c844b6':
  Add --generate-debug-info flag and remove the other two flags.