Update oauth2client to v2.0.1 and googleapiclient to v1.5.0.

client/third_party/infra_libs/ts_mon/common/monitors.py

Index: client/third_party/infra_libs/ts_mon/common/monitors.py
diff --git a/client/third_party/infra_libs/ts_mon/common/monitors.py b/client/third_party/infra_libs/ts_mon/common/monitors.py
index ed3166833f1a5fb0c3de00c285d634b7e2015c25..f495b36d14303aa74553b00a767a961b827bd646 100644
--- a/client/third_party/infra_libs/ts_mon/common/monitors.py
+++ b/client/third_party/infra_libs/ts_mon/common/monitors.py
@@ -11,7 +11,7 @@ import logging
 import traceback
 
 from googleapiclient import discovery
-from oauth2client import gce
+from oauth2client.contrib import gce

[Sergey Berezin, 2016/03/07 17:41:15]

I'd rather update this upstream first. For instance, we can wrap the imports in
try: except to accommodate for the two versions for now. Ideally, we should
upgrade infra.git as well.

 from oauth2client.client import GoogleCredentials
 from oauth2client.file import Storage
 import httplib2
@@ -72,7 +72,7 @@ class PubSubMonitor(Monitor):
       return gce.AppAssertionCredentials(self._SCOPES)
     if credentials_file_path == APPENGINE_CREDENTIALS:  # pragma: no cover
       # This import doesn't work outside appengine, so delay it until it's used.
-      from oauth2client import appengine
+      from oauth2client.contrib import appengine
       from google.appengine.api import app_identity
       logging.info('Initializing with service account %s',
                    app_identity.get_service_account_name())