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

client/third_party/oauth2client/crypt.py

Index: client/third_party/oauth2client/crypt.py
diff --git a/client/third_party/oauth2client/crypt.py b/client/third_party/oauth2client/crypt.py
index c450c5c6a76abbc9789345889a60fc2328e12fee..70bef8c184f92bc39c4778a1277d7990ab240ffe 100644
--- a/client/third_party/oauth2client/crypt.py
+++ b/client/third_party/oauth2client/crypt.py
@@ -24,6 +24,8 @@ from oauth2client._helpers import _json_encode
 from oauth2client._helpers import _to_bytes
 from oauth2client._helpers import _urlsafe_b64decode
 from oauth2client._helpers import _urlsafe_b64encode
+from oauth2client._pure_python_crypt import RsaSigner
+from oauth2client._pure_python_crypt import RsaVerifier
 
 
 CLOCK_SKEW_SECS = 300  # 5 minutes in seconds
@@ -65,11 +67,11 @@ elif PyCryptoSigner:  # pragma: NO COVER
     Signer = PyCryptoSigner
     Verifier = PyCryptoVerifier
 else:  # pragma: NO COVER
-    raise ImportError('No encryption library found. Please install either '
-                      'PyOpenSSL, or PyCrypto 2.6 or later')
+    Signer = RsaSigner
+    Verifier = RsaVerifier
 
 
-def make_signed_jwt(signer, payload):
+def make_signed_jwt(signer, payload, key_id=None):
     """Make a signed JWT.
 
     See http://self-issued.info/docs/draft-jones-json-web-token.html.
@@ -77,15 +79,18 @@ def make_signed_jwt(signer, payload):
     Args:
         signer: crypt.Signer, Cryptographic signer.
         payload: dict, Dictionary of data to convert to JSON and then sign.
+        key_id: string, (Optional) Key ID header.
 
     Returns:
         string, The JWT for the payload.
     """
     header = {'typ': 'JWT', 'alg': 'RS256'}
+    if key_id is not None:
+        header['kid'] = key_id
 
     segments = [
-      _urlsafe_b64encode(_json_encode(header)),
-      _urlsafe_b64encode(_json_encode(payload)),
+        _urlsafe_b64encode(_json_encode(header)),
+        _urlsafe_b64encode(_json_encode(payload)),
     ]
     signing_input = b'.'.join(segments)