Merge changes from github.

PiperOrigin-RevId: 201110240
diff --git a/configure.py b/configure.py
index bde7af8..ada342a 100644
--- a/configure.py
+++ b/configure.py
@@ -1397,6 +1397,10 @@
   write_to_bazelrc('build --define grpc_no_ares=true')
 
 
+def set_build_strip_flag():
+  write_to_bazelrc('build --strip=always')
+
+
 def set_windows_build_flags():
   if is_windows():
     # The non-monolithic build is not supported yet
@@ -1519,6 +1523,7 @@
 
   set_grpc_build_flags()
   set_cc_opt_flags(environ_cp)
+  set_build_strip_flag()
   set_windows_build_flags()
 
   if get_var(