Update from https://crrev.com/328418

build/android/pylib/constants/__init__.py

 # Copyright (c) 2012 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.
 
 """Defines a set of constants shared by test runners and other scripts."""
 
 # TODO(jbudorick): Split these constants into coherent modules.
 
 # pylint: disable=W0212
 
@@ skipping 84 matching lines @@
         'chrome_shell_devtools_remote',
         'org.chromium.chrome.shell.tests'),
     'android_webview_shell': PackageInfo(
         'org.chromium.android_webview.shell',
         'org.chromium.android_webview.shell.AwShellActivity',
         '/data/local/tmp/android-webview-command-line',
         None,
         'org.chromium.android_webview.test'),
     'gtest': PackageInfo(
         'org.chromium.native_test',
-        'org.chromium.native_test.ChromeNativeTestActivity',
+        'org.chromium.native_test.NativeTestActivity',
         '/data/local/tmp/chrome-native-tests-command-line',
         None,
         None),
     'components_browsertests': PackageInfo(
         'org.chromium.components_browsertests_apk',
         ('org.chromium.components_browsertests_apk' +
          '.ComponentsBrowserTestsActivity'),
         '/data/local/tmp/components-browser-tests-command-line',
         None,
         None),
@@ skipping 106 matching lines @@
 VALID_ENVIRONMENTS = ['local', 'remote_device']
 VALID_TEST_TYPES = ['gtest', 'instrumentation', 'junit', 'linker', 'monkey',
                     'perf', 'python', 'uiautomator', 'uirobot']
 VALID_DEVICE_TYPES = ['Android', 'iOS']
 
 
 def GetBuildType():
   try:
     return os.environ['BUILDTYPE']
   except KeyError:
-    raise Exception('The BUILDTYPE environment variable has not been set')
+    raise EnvironmentError(
+        'The BUILDTYPE environment variable has not been set')
 
 
 def SetBuildType(build_type):
   os.environ['BUILDTYPE'] = build_type
 
 
 def SetBuildDirectory(build_directory):
   os.environ['CHROMIUM_OUT_DIR'] = build_directory
 
 
-def SetOutputDirectort(output_directory):
+def SetOutputDirectory(output_directory):
   os.environ['CHROMIUM_OUTPUT_DIR'] = output_directory
 
 
 def GetOutDirectory(build_type=None):
   """Returns the out directory where the output binaries are built.
 
   Args:
     build_type: Build type, generally 'Debug' or 'Release'. Defaults to the
       globally set build type environment variable BUILDTYPE.
   """
@@ skipping 40 matching lines @@
       subprocess.call(['adb', 'version'], stdout=devnull, stderr=devnull)
     return 'adb'
   except OSError:
     logging.debug('No adb found in $PATH, fallback to checked in binary.')
     return os.path.join(ANDROID_SDK_ROOT, 'platform-tools', 'adb')
 
 # Exit codes
 ERROR_EXIT_CODE = 1
 INFRA_EXIT_CODE = 87
 WARNING_EXIT_CODE = 88