sync and resolve conflict

.travis.yml

BUILD

Makefile

build.json

include/grpc/support/slice_buffer.h

src/core/iomgr/endpoint_pair_windows.c

src/core/iomgr/tcp_server_posix.c

src/core/profiling/timers.c

src/core/profiling/timers.h

src/core/profiling/timers_preciseclock.h

src/core/security/credentials.c

src/core/security/credentials.h

src/core/security/factories.c

src/core/security/security_context.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

src/core/surface/init.c

src/core/surface/secure_channel_create.c