am b4b470de: am d2cf1b92: Merge "Add --no-include-debug-symbols to avoid bloat in user builds"

* commit 'b4b470de684436d186c673d98571b210248aa4f8':
  Add --no-include-debug-symbols to avoid bloat in user builds