Merge branch 'master' of github.com:grpc/grpc into sanity

BUILD

Makefile

build.json

include/grpc/support/port_platform.h

include/grpc/support/slice_buffer.h

include/grpc/support/sync.h

include/grpc/support/tls.h

include/grpc/support/tls_gcc.h

include/grpc/support/tls_msvc.h

include/grpc/support/tls_pthread.h

src/compiler/cpp_generator.cc

src/core/iomgr/endpoint_pair_windows.c

src/core/iomgr/pollset_multipoller_with_poll_posix.c

src/core/iomgr/pollset_posix.c

src/core/iomgr/tcp_server_posix.c

src/core/security/factories.c

src/core/security/security_context.h

src/core/security/server_secure_chttp2.c

src/core/support/slice_buffer.c

src/core/support/time_win32.c