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

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