Revert of [Android] Remove adb_commands from telemetry. (Reland)

build/android/pylib/screenshot.py

 # Copyright 2013 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.
 
 import logging
 import os
 import tempfile
 import time
 
 from pylib import cmd_helper
-from pylib import constants
 from pylib import device_signal
 from pylib.device import device_errors
 
 # TODO(jbudorick) Remove once telemetry gets switched over.
 import pylib.android_commands
 import pylib.device.device_utils
 
 
 class VideoRecorder(object):
   """Records a screen capture video from an Android Device (KitKat or newer).
@@ skipping 12 matching lines @@
     # TODO(jbudorick) Remove once telemetry gets switched over.
     if isinstance(device, pylib.android_commands.AndroidCommands):
       device = pylib.device.device_utils.DeviceUtils(device)
     self._device = device
     self._device_file = (
         '%s/screen-recording.mp4' % device.GetExternalStoragePath())
     self._recorder = None
     self._recorder_stdout = None
     self._is_started = False
 
-    self._args = [constants.GetAdbPath()]
+    self._args = ['adb']
     if str(self._device):
       self._args += ['-s', str(self._device)]
     self._args += ['shell', 'screenrecord', '--verbose']
     self._args += ['--bit-rate', str(megabits_per_second * 1000 * 1000)]
     if size:
       self._args += ['--size', '%dx%d' % size]
     if rotate:
       self._args += ['--rotate']
     self._args += [self._device_file]
 
@@ skipping 36 matching lines @@
     # TODO(jbudorick): Merge filename generation with the logic for doing so in
     # DeviceUtils.
     host_file_name = (
         host_file
         or 'screen-recording-%s.mp4' % time.strftime('%Y%m%dT%H%M%S',
                                                      time.localtime()))
     host_file_name = os.path.abspath(host_file_name)
     self._device.PullFile(self._device_file, host_file_name)
     self._device.RunShellCommand('rm -f "%s"' % self._device_file)
     return host_file_name