cbuildbot: re-enable the SyncChrome stage too

Follow up to previous commit.

BUG=chromium:700813
TEST=None

Change-Id: Ifb17f444c7b8410016a447c60eb9a84d8e7c295a
Reviewed-on: https://chromium-review.googlesource.com/1146048
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
diff --git a/scripts/cbuildbot.py b/scripts/cbuildbot.py
index 9b77311..c75aacc 100644
--- a/scripts/cbuildbot.py
+++ b/scripts/cbuildbot.py
@@ -586,7 +586,7 @@
     self._RunStage(build_stages.UprevStage, boards=[], enter_chroot=False)
     self._RunStage(build_stages.InitSDKStage)
     self._RunStage(build_stages.SetupBoardStage, constants.CHROOT_BUILDER_BOARD)
-#    self._RunStage(chrome_stages.SyncChromeStage)
+    self._RunStage(chrome_stages.SyncChromeStage)
 #    self._RunStage(chrome_stages.PatchChromeStage)
     self._RunStage(sdk_stages.SDKPackageStage)
     self._RunStage(sdk_stages.SDKTestStage)
@@ -605,7 +605,7 @@
     self._RunStage(build_stages.UprevStage)
     # The CQ/Chrome PFQ master will not actually run the SyncChrome stage, but
     # we want the logic that gets triggered when SyncChrome stage is skipped.
-#    self._RunStage(chrome_stages.SyncChromeStage)
+    self._RunStage(chrome_stages.SyncChromeStage)
 #    self._RunStage(artifact_stages.MasterUploadPrebuiltsStage)
 
   def _RunPayloadsBuild(self):
@@ -623,7 +623,7 @@
     self._RunStage(build_stages.InitSDKStage)
     self._RunStage(build_stages.UprevStage)
     self._RunSetupBoard()
-#    self._RunStage(chrome_stages.SyncChromeStage)
+    self._RunStage(chrome_stages.SyncChromeStage)
 #    self._RunStage(chrome_stages.PatchChromeStage)
 
     # Prepare stages to run in background.  If child_configs exist then