Manual partial update from from https://crrev.com/337502

build/android/pylib/instrumentation/test_jar.py

 # Copyright (c) 2013 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.
 
 """Helper class for instrumenation test jar."""
 # pylint: disable=W0702
 
 import logging
 import os
 import pickle
@@ skipping 47 matching lines @@
 
   def _GetCachedProguardData(self):
     if (os.path.exists(self._pickled_proguard_name) and
         (os.path.getmtime(self._pickled_proguard_name) >
          os.path.getmtime(self._jar_path))):
       logging.info('Loading cached proguard output from %s',
                    self._pickled_proguard_name)
       try:
         with open(self._pickled_proguard_name, 'r') as r:
           d = pickle.loads(r.read())
-        jar_md5 = md5sum.CalculateHostMd5Sums(self._jar_path)[self._jar_path]
+        jar_md5 = md5sum.CalculateHostMd5Sums(
+          self._jar_path)[os.path.realpath(self._jar_path)]
         if (d['JAR_MD5SUM'] == jar_md5 and
             d['VERSION'] == PICKLE_FORMAT_VERSION):
           self._test_methods = d['TEST_METHODS']
           return True
       except:
         logging.warning('PICKLE_FORMAT_VERSION has changed, ignoring cache')
     return False
 
   def _GetProguardData(self):
     logging.info('Retrieving test methods via proguard.')
@@ skipping 20 matching lines @@
         qualified_method = '%s#%s' % (c['class'], m['method'])
         annotations = dict(class_annotations)
         annotations.update(m['annotations'])
         self._test_methods[qualified_method] = m
         self._test_methods[qualified_method]['annotations'] = annotations
 
     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)[self._jar_path]}
+              md5sum.CalculateHostMd5Sums(
+                self._jar_path)[os.path.realpath(self._jar_path)]}
     with open(self._pickled_proguard_name, 'w') as f:
       f.write(pickle.dumps(d))
 
   @staticmethod
   def _IsTestMethod(test):
     class_name, method = test.split('#')
     return class_name.endswith('Test') and method.startswith('test')
 
   def GetTestAnnotations(self, test):
     """Returns a list of all annotations for the given |test|. May be empty."""
@@ skipping 99 matching lines @@
     devices = device_utils.DeviceUtils.parallel()
     min_sdk_version = min(devices.build_version_sdk.pGet(None))
     tests = [t for t in tests
              if self._IsTestValidForSdkRange(t, min_sdk_version)]
 
     return tests
 
   @staticmethod
   def IsHostDrivenTest(test):
     return 'pythonDrivenTests' in test