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

src/core/ext/client_channel/http_connect_handshaker.c

src/core/ext/client_channel/http_connect_handshaker.h

src/python/grpcio_tests/tests/qps/benchmark_client.py

src/python/grpcio_tests/tests/stress/client.py

src/ruby/pb/test/client.rb

templates/tools/doxygen/Doxyfile.include

test/http2_test/http2_base_server.py

test/http2_test/http2_test_server.py

tools/doxygen/Doxyfile.c++

tools/doxygen/Doxyfile.c++.internal

tools/doxygen/Doxyfile.core

tools/doxygen/Doxyfile.core.internal