Update from https://crrev.com/308331

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 197 matching lines @@
       # Filters 'class.test' names and populates |tests| with the corresponding
       # 'package.path.class#test' names.
       tests = [
           sanitized_test_names[t] for t in unittest_util.FilterTestNames(
               sanitized_test_names.keys(), test_filter.replace('#', '.'))]
     else:
       tests = available_tests
 
     # Filter out any tests with SDK level requirements that don't match the set
     # of attached devices.
-    sdk_versions = [
-        int(v) for v in
-        device_utils.DeviceUtils.parallel().GetProp(
-            'ro.build.version.sdk').pGet(None)]
+    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_versions))]
+             if self._IsTestValidForSdkRange(t, min_sdk_version)]
 
     return tests
 
   @staticmethod
   def IsHostDrivenTest(test):
     return 'pythonDrivenTests' in test