Revert of [Android] Add a configurable environment for devil/. (RELAND)

build/android/incremental_install/installer.py

 #!/usr/bin/env python
 #
 # Copyright 2015 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.
 
 """Install *_incremental.apk targets as well as their dependent files."""
 
 import argparse
 import glob
 import logging
 import os
 import posixpath
 import shutil
 import sys
 
-sys.path.append(
-    os.path.abspath(os.path.join(os.path.dirname(__file__), os.pardir)))
-import devil_chromium
+sys.path.append(os.path.join(os.path.dirname(__file__), os.pardir))
 from devil.android import apk_helper
 from devil.android import device_utils
 from devil.android import device_errors
 from devil.android.sdk import version_codes
 from devil.utils import reraiser_thread
 from pylib import constants
 from pylib.utils import run_tests_helper
 from pylib.utils import time_profile
 
 prev_sys_path = list(sys.path)
@@ skipping 197 matching lines @@
                       action='count',
                       help='Verbose level (multiple times for more)')
 
   args = parser.parse_args()
 
   run_tests_helper.SetLogLevel(args.verbose_count)
   constants.SetBuildType('Debug')
   if args.output_directory:
     constants.SetOutputDirectory(args.output_directory)
 
-  devil_chromium.Initialize(output_directory=constants.GetOutputDirectory())
-
   if args.device:
     # Retries are annoying when commands fail for legitimate reasons. Might want
     # to enable them if this is ever used on bots though.
     device = device_utils.DeviceUtils(
         args.device, default_retries=0, enable_device_files_cache=True)
   else:
     devices = device_utils.DeviceUtils.HealthyDevices(
         default_retries=0, enable_device_files_cache=True)
     if not devices:
       raise device_errors.NoDevicesError()
@@ skipping 13 matching lines @@
   if args.uninstall:
     Uninstall(device, apk.GetPackageName())
   else:
     Install(device, apk, split_globs=args.splits, lib_dir=args.lib_dir,
             dex_files=args.dex_files, enable_device_cache=args.cache,
             use_concurrency=args.threading)
 
 
 if __name__ == '__main__':
   sys.exit(main())