Roll //build, //native_client, and a few more targets of opportunity.

build/android/pylib/instrumentation/test_jar.py

Index: build/android/pylib/instrumentation/test_jar.py
diff --git a/build/android/pylib/instrumentation/test_jar.py b/build/android/pylib/instrumentation/test_jar.py
index c3faef31f70f026c23f183def272d9354cf9c99e..9c38510d8afe94ad66ad9f55402ab6a30df4e077 100644
--- a/build/android/pylib/instrumentation/test_jar.py
+++ b/build/android/pylib/instrumentation/test_jar.py
@@ -65,7 +65,7 @@ class TestJar(object):
       try:
         with open(self._pickled_proguard_name, 'r') as r:
           d = pickle.loads(r.read())
-        jar_md5 = md5sum.CalculateHostMd5Sums(self._jar_path)[0].hash
+        jar_md5 = md5sum.CalculateHostMd5Sums(self._jar_path)[self._jar_path]
         if (d['JAR_MD5SUM'] == jar_md5 and
             d['VERSION'] == PICKLE_FORMAT_VERSION):
           self._test_methods = d['TEST_METHODS']
@@ -105,7 +105,8 @@ class TestJar(object):
     logging.info('Storing proguard output to %s', self._pickled_proguard_name)
     d = {'VERSION': PICKLE_FORMAT_VERSION,
          'TEST_METHODS': self._test_methods,
-         'JAR_MD5SUM': md5sum.CalculateHostMd5Sums(self._jar_path)[0].hash}
+         'JAR_MD5SUM':
+              md5sum.CalculateHostMd5Sums(self._jar_path)[self._jar_path]}
     with open(self._pickled_proguard_name, 'w') as f:
       f.write(pickle.dumps(d))