Bring Mac and iOS builders back to the CQ.

The vpython issue appears to have gone away and hermetic Xcode sorted
out the other problem.

Bug: chromium:888687, chromium:890351
Change-Id: I9da893b7f21f0bc7c03e1e70c0e3e86f9720cec1
Reviewed-on: https://boringssl-review.googlesource.com/32304
Reviewed-by: Adam Langley <agl@google.com>
Commit-Queue: David Benjamin <davidben@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
diff --git a/infra/config/cq.cfg b/infra/config/cq.cfg
index 0843f0b..72c95d8 100644
--- a/infra/config/cq.cfg
+++ b/infra/config/cq.cfg
@@ -43,10 +43,9 @@
       builders { name: "linux_shared" }
       builders { name: "linux_small" }
 
-      # Mac builders are broken. https://crbug.com/888687.
-      # builders { name: "mac" }
-      # builders { name: "mac_rel" }
-      # builders { name: "mac_small" }
+      builders { name: "mac" }
+      builders { name: "mac_rel" }
+      builders { name: "mac_small" }
 
       builders { name: "win32" }
       builders { name: "win32_rel" }
@@ -65,9 +64,8 @@
       builders { name: "linux_fips_clang_rel" }
       builders { name: "linux_fips_noasm_asan" }
 
-      # iOS builders are broken. https://crbug.com/890351.
-      # builders { name: "ios_compile" }
-      # builders { name: "ios64_compile" }
+      builders { name: "ios_compile" }
+      builders { name: "ios64_compile" }
 
       builders { name: "android_arm_compile" }
       builders { name: "android_aarch64_compile" }