Update from https://crrev.com/304715

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 122 matching lines @@
   def _AnnotationsMatchFilters(annotation_filter_list, annotations):
     """Checks if annotations match any of the filters."""
     if not annotation_filter_list:
       return True
     for annotation_filter in annotation_filter_list:
       filters = annotation_filter.split('=')
       if len(filters) == 2:
         key = filters[0]
         value_list = filters[1].split(',')
         for value in value_list:
-          if key in annotations and value == annotations['key']:
+          if key in annotations and value == annotations[key]:
             return True
       elif annotation_filter in annotations:
         return True
     return False
 
   def GetAnnotatedTests(self, annotation_filter_list):
     """Returns a list of all tests that match the given annotation filters."""
     return [test for test in self.GetTestMethods()
             if self._IsTestMethod(test) and self._AnnotationsMatchFilters(
                 annotation_filter_list, self.GetTestAnnotations(test))]
@@ skipping 76 matching lines @@
             'ro.build.version.sdk').pGet(None)]
     tests = filter(
         lambda t: self._IsTestValidForSdkRange(t, min(sdk_versions)),
         tests)
 
     return tests
 
   @staticmethod
   def IsHostDrivenTest(test):
     return 'pythonDrivenTests' in test