Merge "Pass --generate-debug-info only when --perf is passed."
am: fef7aabd58

* commit 'fef7aabd582ae0237a44947c5e0b24cb63e395f0':
  Pass --generate-debug-info only when --perf is passed.