Merge pull request #12868 from ctiller/merge-fixup

Import fixes

src/core/lib/iomgr/block_annotate.h

@@ -39,9 +39,14 @@ void gpr_thd_end_blocking_region();
   do {                                        \
     gpr_thd_start_blocking_region();          \
   } while (0)
-#define GRPC_SCHEDULING_END_BLOCKING_REGION \
+#define GRPC_SCHEDULING_END_BLOCKING_REGION_NO_EXEC_CTX \
-  do {                                      \
+  do {                                                  \
-    gpr_thd_end_blocking_region();          \
+    gpr_thd_end_blocking_region();                      \
+  } while (0)
+#define GRPC_SCHEDULING_END_BLOCKING_REGION_WITH_EXEC_CTX(ec) \
+  do {                                                        \
+    gpr_thd_end_blocking_region();                            \
+    grpc_exec_ctx_invalidate_now((ec));                       \
   } while (0)
 #else
 #define GRPC_SCHEDULING_START_BLOCKING_REGION \