Update from https://crrev.com/308331

build/android/pylib/content_settings.py

 # Copyright 2014 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.
 
 from pylib import constants
 
 
 class ContentSettings(dict):
 
   """A dict interface to interact with device content settings.
 
   System properties are key/value pairs as exposed by adb shell content.
   """
 
   def __init__(self, table, device):
     super(ContentSettings, self).__init__()
-    sdk_version_string = device.GetProp('ro.build.version.sdk')
-    try:
-      sdk_version = int(sdk_version_string)
-      assert sdk_version >= constants.ANDROID_SDK_VERSION_CODES.JELLY_BEAN, (
-          'ContentSettings supported only on SDK 16 and later')
-    except ValueError:
-      assert False, ('Unknown SDK version %s' % sdk_version_string)
+    assert (device.build_version_sdk
+            >= constants.ANDROID_SDK_VERSION_CODES.JELLY_BEAN), (
+        'ContentSettings supported only on SDK 16 and later')
     self._table = table
     self._device = device
 
   @staticmethod
   def _GetTypeBinding(value):
     if isinstance(value, bool):
       return 'b'
     if isinstance(value, float):
       return 'f'
     if isinstance(value, int):
@@ skipping 46 matching lines @@
               self._GetTypeBinding(value), value),
           as_root=True)
 
   def __delitem__(self, key):
     self._device.RunShellCommand(
         'content delete --uri content://%s '
         '--bind name:%s:%s' % (
             self._table,
             self._GetTypeBinding(key), key),
         as_root=True)