Re-enable DepsCache using GOMA_DEPS_CACHE_FILE

scripts/slave/recipes/chromium.expected/full_chromium_android_Android_Swarm_Builder.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]/Android_Swarm_Builder",
       "511"
     ],
     "name": "makedirs checkout path",
@@ skipping 347 matching lines @@
       "--src-dir",
       "[BUILDER_CACHE]/Android_Swarm_Builder/src",
       "--goma-cache-dir",
       "[GOMA_CACHE]",
       "--buildbot-buildername",
       "Android Swarm Builder",
       "--buildbot-mastername",
       "chromium.android",
       "--buildbot-slavename",
       "TestSlavename",
-      "--goma-deps-cache-dir",
-      "[GOMA_DEPS_CACHE]",
+      "--goma-deps-cache-file",
+      "Android_Swarm_Builder.gomadeps",
       "--build-data-dir",
       "[ROOT]/build_data_dir",
       "--compiler",
       "goma",
       "--goma-jsonstatus",
       "/path/to/tmp/json",
       "--goma-service-account-json-file",
       "/creds/service_accounts/service-account-goma-client.json",
       "--goma-dir",
       "[CACHE]/cipd/goma",
@@ skipping 133 matching lines @@
       "@@@STEP_LOG_LINE@python.inline@  os.remove(report)@@@",
       "@@@STEP_LOG_END@python.inline@@@"
     ]
   },
   {
     "name": "$result",
     "recipe_result": null,
     "status_code": 0
   }
 ]