[Android] Port chromium+devil to catapult+dependency_manager

build/android/devil/devil_env.py

Index: build/android/devil/devil_env.py
diff --git a/build/android/devil/devil_env.py b/build/android/devil/devil_env.py
index efec60307fd35682f1e2dfb20fbb1521cce30cde..4caef32c9d112ae802d227f2cc11fe5cc9af674e 100644
--- a/build/android/devil/devil_env.py
+++ b/build/android/devil/devil_env.py
@@ -4,31 +4,28 @@
 
 import contextlib
 import json
-import logging
 import os
 import platform
 import sys
 import tempfile
 import threading
 
-# TODO(jbudorick): Update this once dependency_manager moves to catapult.
-CATAPULT_BASE_PATH = os.path.abspath(os.path.join(
-    os.path.dirname(__file__), os.pardir, os.pardir, os.pardir,
-    'tools', 'telemetry'))
+CATAPULT_ROOT_PATH = os.path.abspath(os.path.join(
+    os.path.dirname(__file__), '..', '..', '..', 'third_party', 'catapult'))
+DEPENDENCY_MANAGER_PATH = os.path.join(
+    CATAPULT_ROOT_PATH, 'dependency_manager')
 
 @contextlib.contextmanager
 def SysPath(path):
   sys.path.append(path)
   yield
   if sys.path[-1] != path:
-    logging.debug('Expected %s at the end of sys.path. Full sys.path: %s',
-                  path, str(sys.path))
     sys.path.remove(path)
   else:
     sys.path.pop()
 
-with SysPath(CATAPULT_BASE_PATH):
-  from catapult_base import dependency_manager # pylint: disable=import-error
+with SysPath(DEPENDENCY_MANAGER_PATH):
+  import dependency_manager # pylint: disable=import-error
 
 _ANDROID_BUILD_TOOLS = {'aapt', 'dexdump', 'split-select'}