Merge remote-tracking branch 'upstream/master' into cq_create_api_changes

CMakeLists.txt

Makefile

bazel/cc_grpc_library.bzl

bazel/grpc_build_system.bzl

build.yaml

doc/PROTOCOL-WEB.md

src/compiler/cpp_generator.cc

src/core/ext/client_channel/client_channel_plugin.c

src/core/ext/client_channel/http_proxy.c

src/core/ext/client_channel/parse_address.c

src/core/ext/client_channel/resolver_registry.c

src/core/ext/client_channel/resolver_registry.h

src/core/ext/client_channel/subchannel.c

src/core/ext/client_channel/subchannel.h

src/core/ext/client_channel/uri_parser.c

src/core/ext/client_channel/uri_parser.h

src/core/ext/lb_policy/grpclb/grpclb.c

src/core/ext/transport/chttp2/client/chttp2_connector.c

...ore/ext/transport/chttp2/client/insecure/channel_create.c

...xt/transport/chttp2/client/secure/secure_channel_create.c