Update from chromium https://crrev.com/301315

build/android/pylib/constants.py

Index: build/android/pylib/constants.py
diff --git a/build/android/pylib/constants.py b/build/android/pylib/constants.py
index f54d49836b8b1c2f9d1e5a1225a86d8338070218..95b1868760c58675fe1298e48d723495995a2f87 100644
--- a/build/android/pylib/constants.py
+++ b/build/android/pylib/constants.py
@@ -162,7 +162,7 @@ class ANDROID_SDK_VERSION_CODES(object):
   LOLLIPOP = 21
 
 ANDROID_SDK_VERSION = ANDROID_SDK_VERSION_CODES.LOLLIPOP
-ANDROID_SDK_BUILD_TOOLS_VERSION = '21.0.0'
+ANDROID_SDK_BUILD_TOOLS_VERSION = '21.0.1'
 ANDROID_SDK_ROOT = os.path.join(DIR_SOURCE_ROOT,
                                 'third_party/android_tools/sdk')
 ANDROID_SDK_TOOLS = os.path.join(ANDROID_SDK_ROOT,
@@ -182,6 +182,23 @@ UPSTREAM_FLAKINESS_SERVER = 'test-results.appspot.com'
 
 DEVICE_LOCAL_PROPERTIES_PATH = '/data/local.prop'
 
+PYTHON_UNIT_TEST_SUITES = {
+  'pylib_py_unittests': {
+    'path': os.path.join(DIR_SOURCE_ROOT, 'build', 'android'),
+    'test_modules': [
+      'pylib.device.device_utils_test',
+    ]
+  },
+# TODO(mkosiba) Enable after fixing these tests.
+# 'gyp_py_unittests': {
+#   'path': os.path.join(constants.DIR_SOURCE_ROOT, 'build', 'android', 'gyp'),
+#   'test_modules': [
+#     'java_cpp_enum_tests'
+#   ]
+# },
+}
+
+
 def GetBuildType():
   try:
     return os.environ['BUILDTYPE']