Update from https://crrev.com/308996

build/android/pylib/remote/device/remote_device_environment.py

 # Copyright 2014 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.
 
 """Environment setup and teardown for remote devices."""
 
+import logging
 import os
 import sys
 
 from pylib import constants
 from pylib.base import environment
+from pylib.remote.device import appurify_sanitized
 from pylib.remote.device import remote_device_helper
 
-sys.path.append(os.path.join(
-    constants.DIR_SOURCE_ROOT, 'third_party', 'requests', 'src'))
-sys.path.append(os.path.join(
-    constants.DIR_SOURCE_ROOT, 'third_party', 'appurify-python', 'src'))
-import appurify.api
-
-
 class RemoteDeviceEnvironment(environment.Environment):
   """An environment for running on remote devices."""
 
   def __init__(self, args, error_func):
     """Constructor.
 
     Args:
       args: Command line arguments.
       error_func: error to show when using bad command line arguments.
     """
@@ skipping 58 matching lines @@
     """Set up the test run when used as a context manager."""
     self.SetUp()
     return self
 
   def __exit__(self, exc_type, exc_val, exc_tb):
     """Tears down the test run when used as a context manager."""
     self.TearDown()
 
   def _GetAccessToken(self):
     """Generates access token for remote device service."""
-    access_token_results = appurify.api.access_token_generate(
+    logging.info('Generating remote service access token')
+    access_token_results = appurify_sanitized.api.access_token_generate(
         self._api_key, self._api_secret)
     remote_device_helper.TestHttpResponse(access_token_results,
                                           'Unable to generate access token.')
     self._access_token = access_token_results.json()['response']['access_token']
 
   def _RevokeAccessToken(self):
     """Destroys access token for remote device service."""
-    revoke_token_results = appurify.api.access_token_revoke(self._access_token)
+    logging.info('Revoking remote service access token')
+    revoke_token_results = appurify_sanitized.api.access_token_revoke(
+        self._access_token)
     remote_device_helper.TestHttpResponse(revoke_token_results,
                                           'Unable to revoke access token.')
 
   def _SelectDevice(self):
     """Select which device to use."""
-    dev_list_res = appurify.api.devices_list(self._access_token)
+    logging.info('Finding %s with %s to run tests on.' %
+        (self._remote_device, self._remote_device_os))
+    dev_list_res = appurify_sanitized.api.devices_list(self._access_token)
     remote_device_helper.TestHttpResponse(dev_list_res,
                                           'Unable to generate access token.')
     device_list = dev_list_res.json()['response']
     for device in device_list:
       if (device['name'] == self._remote_device
           and device['os_version'] == self._remote_device_os):
         return device['device_type_id']
     raise remote_device_helper.RemoteDeviceError(
         'No device found: %s %s' % (self._remote_device,
         self._remote_device_os))
@@ skipping 18 matching lines @@
   def runner_package(self):
     return self._runner_package
 
   @property
   def trigger(self):
     return self._trigger
 
   @property
   def collect(self):
     return self._collect