Update from https://crrev.com/327068

build/android/pylib/instrumentation/instrumentation_test_instance.py

 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import logging
 import os
 import pickle
 import re
 import sys
 
@@ skipping 317 matching lines @@
 
   def _GetTestsFromPickle(self, pickle_path, jar_path):
     if not os.path.exists(pickle_path):
       raise self.ProguardPickleException('%s does not exist.' % pickle_path)
     if os.path.getmtime(pickle_path) <= os.path.getmtime(jar_path):
       raise self.ProguardPickleException(
           '%s newer than %s.' % (jar_path, pickle_path))
 
     with open(pickle_path, 'r') as pickle_file:
       pickle_data = pickle.loads(pickle_file.read())
-    jar_md5, _ = md5sum.CalculateHostMd5Sums(jar_path)[0]
+    jar_md5 = md5sum.CalculateHostMd5Sums(jar_path)[jar_path]
 
     try:
       if pickle_data['VERSION'] != _PICKLE_FORMAT_VERSION:
         raise self.ProguardPickleException('PICKLE_FORMAT_VERSION has changed.')
       if pickle_data['JAR_MD5SUM'] != jar_md5:
         raise self.ProguardPickleException('JAR file MD5 sum differs.')
       return pickle_data['TEST_METHODS']
     except TypeError as e:
       logging.error(pickle_data)
       raise self.ProguardPickleException(str(e))
@@ skipping 21 matching lines @@
       return {
         'class': c['class'],
         'annotations': recursive_get_class_annotations(c),
         'methods': [m for m in c['methods'] if is_test_method(m)],
       }
 
     return [stripped_test_class(c) for c in p['classes']
             if is_test_class(c)]
 
   def _SaveTestsToPickle(self, pickle_path, jar_path, tests):
-    jar_md5, _ = md5sum.CalculateHostMd5Sums(jar_path)[0]
+    jar_md5 = md5sum.CalculateHostMd5Sums(jar_path)[jar_path]
     pickle_data = {
       'VERSION': _PICKLE_FORMAT_VERSION,
       'JAR_MD5SUM': jar_md5,
       'TEST_METHODS': tests,
     }
     with open(pickle_path, 'w') as pickle_file:
       pickle.dump(pickle_data, pickle_file)
 
   def _FilterTests(self, tests):
 
@@ skipping 62 matching lines @@
   def GenerateTestResults(
       result_code, result_bundle, statuses, start_ms, duration_ms):
     return GenerateTestResults(result_code, result_bundle, statuses,
                                start_ms, duration_ms)
 
   #override
   def TearDown(self):
     if self._isolate_delegate:
       self._isolate_delegate.Clear()