Attempted fix

BUILD

@@ -457,7 +457,7 @@ grpc_cc_library(
 )
 
 grpc_cc_library(
-    name = "grpc_base",
+    name = "grpc_base_c",
     srcs = [
         "src/core/lib/channel/channel_args.c",
         "src/core/lib/channel/channel_stack.c",
@@ -566,7 +566,6 @@ grpc_cc_library(
         "src/core/lib/surface/completion_queue.c",
         "src/core/lib/surface/completion_queue_factory.c",
         "src/core/lib/surface/event_string.c",
-        "src/core/lib/surface/lame_client.cc",
         "src/core/lib/surface/metadata_array.c",
         "src/core/lib/surface/server.c",
         "src/core/lib/surface/validate_metadata.c",
@@ -722,6 +721,17 @@ grpc_cc_library(
     ],
 )
 
+grpc_cc_library(
+    name = "grpc_base",
+    language = "c++",
+    srcs = [
+        "src/core/lib/surface/lame_client.cc",
+    ],
+    deps = [
+        "grpc_base_c",
+    ]
+)
+
 grpc_cc_library(
     name = "grpc_client_channel",
     srcs = [

third_party/protobuf

@@ -1 +1 @@
-Subproject commit a6189acd18b00611c1dc7042299ad75486f08a1a
+Subproject commit 593e917c176b5bc5aafa57bf9f6030d749d91cd5