Remove AWS_CREDENTIAL_FILE env-variable for editor bots as well

client/tools/buildbot_annotated_steps.py

Index: client/tools/buildbot_annotated_steps.py
diff --git a/client/tools/buildbot_annotated_steps.py b/client/tools/buildbot_annotated_steps.py
index 0eba6d52b6c9d7b431680ef48c717311ccbaa0ab..c7360e9c7354ccd923368e98e5cdae4bc67490f2 100755
--- a/client/tools/buildbot_annotated_steps.py
+++ b/client/tools/buildbot_annotated_steps.py
@@ -105,10 +105,12 @@ def ProcessTools(mode, name, version):
           '--mode=' + mode, '--revision=' + version,
           '--name=' + name, '--out=' + outdir]
   local_env = os.environ.copy()
-  # The buildbot sets BOTO_CONFIG to the chromium specific file, we use the one
-  # in home.
+  # The buildbot sets AWS_CREDENTIAL_FILE/BOTO_CONFIG to the chromium specific
+  # file, we use the one in home.
   if 'BOTO_CONFIG' in local_env:
     del local_env['BOTO_CONFIG']
+  if 'AWS_CREDENTIAL_FILE' in local_env:
+    del local_env['AWS_CREDENTIAL_FILE']
   #if 'linux' in name:
   #  javahome = os.path.join(os.path.expanduser('~'), 'jdk1.6.0_25')
   #  local_env['JAVA_HOME'] = javahome