Merge branch 'nanopb_build_cleanup' of github.com:dgquintas/grpc into nanopb_build_cleanup

gRPC-Core.podspec

@@ -1264,6 +1264,7 @@ Pod::Spec.new do |s|
 
   # TODO (mxyan): Instead of this hack, add include path "third_party" to C core's include path?
   s.prepare_command = <<-END_OF_COMMAND
-    find src/core/ -type f ! -path '*.back*' -exec sed -E -i'.back' 's;#include "third_party/nanopb/(.*)";#include <nanopb/\\1>;g' {} \\\;
+    find src/core/ -type f ! -path '*.grpc_back' -exec sed -E -i'.grpc_back' 's;#include "(pb(_.*)?\\.h)";#include <nanopb/\\1>;g' {} \\\;
+    find src/core/ -type f -path '*.grpc_back' | xargs rm
   END_OF_COMMAND
 end

templates/gRPC-Core.podspec.template

@@ -220,6 +220,7 @@
 
     # TODO (mxyan): Instead of this hack, add include path "third_party" to C core's include path?
     s.prepare_command = <<-END_OF_COMMAND
-      find src/core/ -type f ! -path '*.back*' -exec sed -E -i'.back' 's;#include "third_party/nanopb/(.*)";#include <nanopb/\\1>;g' {} \\\;
+      find src/core/ -type f ! -path '*.grpc_back' -exec sed -E -i'.grpc_back' 's;#include "(pb(_.*)?\\.h)";#include <nanopb/\\1>;g' {} \\\;
+      find src/core/ -type f -path '*.grpc_back' | xargs rm
     END_OF_COMMAND
   end