Fix conflicts caused by formatting

Makefile

build.json

examples/pubsub/publisher_test.cc

examples/pubsub/subscriber_test.cc

include/grpc++/async_generic_service.h

include/grpc++/async_unary_call.h

include/grpc++/byte_buffer.h

include/grpc++/channel_interface.h

include/grpc++/client_context.h

include/grpc++/completion_queue.h

include/grpc++/config.h

include/grpc++/generic_stub.h

include/grpc++/impl/call.h

include/grpc++/impl/client_unary_call.h

include/grpc++/server.h

include/grpc++/server_builder.h

include/grpc++/server_context.h

include/grpc/support/atm_win32.h

include/grpc/support/cpu.h

include/grpc/support/port_platform.h