[Telemetry] Make psutil use the new external_modules helper.

BUG=

Review URL: https://codereview.chromium.org/820603002

Cr-Commit-Position: refs/heads/master@{#313132}

tools/telemetry/telemetry/core/platform/android_platform_backend.py

@@ -27,7 +27,9 @@ from telemetry.core.platform.power_monitor import monsoon_power_monitor
 from telemetry.core.platform.power_monitor import power_monitor_controller
 from telemetry.core.platform.profiler import android_prebuilt_profiler_helper
 from telemetry.util import exception_formatter
+from telemetry.util import external_modules
 
+psutil = external_modules.ImportOptionalModule('psutil')
 util.AddDirToPythonPath(util.GetChromiumSrcDir(),
                         'third_party', 'webpagereplay')
 import adb_install_cert  # pylint: disable=F0401
@@ -46,11 +48,6 @@ try:
 except Exception:
   surface_stats_collector = None
 
-try:
-  import psutil  # pylint: disable=import-error
-except ImportError:
-  psutil = None
-
 
 class AndroidPlatformBackend(
     linux_based_platform_backend.LinuxBasedPlatformBackend):
@@ -642,13 +639,9 @@ def _FixPossibleAdbInstability():
   for process in psutil.process_iter():
     try:
       if 'adb' in process.name:
-        if 'cpu_affinity' in dir(process):
-          process.cpu_affinity([0])      # New versions of psutil.
-        elif 'set_cpu_affinity' in dir(process):
+        if 'set_cpu_affinity' in dir(process):
           process.set_cpu_affinity([0])  # Older versions.
         else:
-          logging.warn(
-              'Cannot set CPU affinity due to stale psutil version: %s',
-              '.'.join(str(x) for x in psutil.version_info))
+          process.cpu_affinity([0])  # New versions of psutil.
     except (psutil.NoSuchProcess, psutil.AccessDenied):
       logging.warn('Failed to set adb process CPU affinity')

tools/telemetry/telemetry/util/external_modules.py

@@ -9,6 +9,7 @@ from distutils import version
 MODULES = {
   'cv2': (version.StrictVersion('2.4.8'), version.StrictVersion('3.0.0')),
   'numpy': (version.StrictVersion('1.6.1'), None),
+  'psutil': (version.StrictVersion('0.5.0'), None),
 }
 
 def ImportRequiredModule(module):