Merge github.com:grpc/grpc into error

BUILD

Makefile

binding.gyp

build.yaml

config.m4

gRPC.podspec

grpc.def

grpc.gemspec

include/grpc++/impl/codegen/async_stream.h

include/grpc++/impl/codegen/async_unary_call.h

include/grpc++/impl/codegen/call.h

include/grpc++/impl/codegen/core_codegen_interface.h

include/grpc++/impl/codegen/sync_stream.h

include/grpc++/support/config_protobuf.h

package.xml

src/compiler/config.h

src/compiler/csharp_generator.cc

src/core/plugin_registry/grpc_cronet_plugin_registry.c

src/csharp/Grpc.Core.Tests/AppDomainUnloadTest.cs

src/csharp/Grpc.Core.Tests/ChannelTest.cs