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