Fix buildbot upload to commondatastorage.

The buildbot masters now set BOTO_CONFIG and
AWS_CREDENTIAL_FILE which was breaking the upload
to nacl commondatastorage.

BUG=
R=binji@chromium.org

Review URL: https://codereview.chromium.org/18947002

git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1563 050acbb0-2703-11df-ab0a-9f3f633ae91d
diff --git a/buildbot_run.py b/buildbot_run.py
index 9e23251..faed334 100755
--- a/buildbot_run.py
+++ b/buildbot_run.py
@@ -182,6 +182,12 @@
 
 
 def main():
+  # Remove BOTO_CONFIG from the environment -- we want to use the NaCl .boto
+  # file that has access to gs://nativeclient-mirror.
+  if 'BOTO_CONFIG' in os.environ:
+    del os.environ['BOTO_CONFIG']
+  if 'AWS_CREDENTIAL_FILE' in os.environ:
+    del os.environ['AWS_CREDENTIAL_FILE']
   StepBuild()
   StepInstall()
   StepInstallSDK()