Merge github.com:google/grpc into async-api

src/core/httpcli/format_request.c

@@ -105,6 +105,8 @@ gpr_slice grpc_httpcli_format_post_request(const grpc_httpcli_request *request,
   }
   gpr_strvec_add(&out, gpr_strdup("\r\n"));
   tmp = gpr_strvec_flatten(&out, &out_len);
+  gpr_strvec_destroy(&out);
+
   if (body_bytes) {
     tmp = gpr_realloc(tmp, out_len + body_size);
     memcpy(tmp + out_len, body_bytes, body_size);

src/core/iomgr/wakeup_fd_eventfd.c

@@ -74,7 +74,7 @@ static int eventfd_check_availability(void) {
   return 1;
 }
 
-const grpc_wakeup_fd_vtable specialized_wakeup_fd_vtable = {
+const grpc_wakeup_fd_vtable grpc_specialized_wakeup_fd_vtable = {
   eventfd_create, eventfd_consume, eventfd_wakeup, eventfd_destroy,
   eventfd_check_availability
 };