Revert of Temporary fix for Angle trybots.

scripts/slave/recipes/chromium_trybot.expected/compile_failure_with_component_rev.json

 [
   {
     "cmd": [
       "python",
       "-u",
       "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n  if os.path.exists(path):\n    print \"%s exists but is not a dir\" % path\n    sys.exit(1)\n  os.makedirs(path, mode)\n",
       "[BUILDER_CACHE]/v8_linux_chromium_gn_rel",
       "511"
     ],
     "name": "makedirs checkout path",
@@ skipping 34 matching lines @@
       "--patchset",
       "1",
       "--rietveld_server",
       "https://codereview.chromium.org",
       "--output_json",
       "/path/to/tmp/json",
       "--revision",
       "src@origin/lkcr",
       "--revision",
       "src/v8@22135",
-      "--output_manifest",
-      "--gerrit_no_rebase_patch_ref"
+      "--output_manifest"
     ],
     "cwd": "[BUILDER_CACHE]/v8_linux_chromium_gn_rel",
     "env": {
       "GCLIENT_KILL_GIT_FETCH_AFTER": "1200",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
     "name": "bot_update",
     "~followup_annotations": [
       "@@@STEP_TEXT@Some step text@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ skipping 571 matching lines @@
       "@@@SET_BUILD_PROPERTY@failure_hash@\"4d6a903860330c798a14ca4fb8a3b9ea8c90b814\"@@@"
     ]
   },
   {
     "name": "$result",
     "reason": "Step('compile (with patch)') failed with return_code 1",
     "recipe_result": null,
     "status_code": 1
   }
 ]