Update from https://crrev.com/312398

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

Index: build/android/pylib/remote/device/remote_device_environment.py
diff --git a/build/android/pylib/remote/device/remote_device_environment.py b/build/android/pylib/remote/device/remote_device_environment.py
index 0e48ee6a3c35b41c3222b185da7da5c47683fe6f..3fdc716cff4989ec6fe415847f5dddd342d8f70a 100644
--- a/build/android/pylib/remote/device/remote_device_environment.py
+++ b/build/android/pylib/remote/device/remote_device_environment.py
@@ -17,6 +17,9 @@ from pylib.remote.device import remote_device_helper
 class RemoteDeviceEnvironment(environment.Environment):
   """An environment for running on remote devices."""
 
+  _ENV_KEY = 'env'
+  _DEVICE_KEY = 'device'
+
   def __init__(self, args, error_func):
     """Constructor.
 
@@ -102,6 +105,16 @@ class RemoteDeviceEnvironment(environment.Environment):
     """Tears down the test run when used as a context manager."""
     self.TearDown()
 
+  def DumpTo(self, persisted_data):
+    env_data = {
+      self._DEVICE_KEY: self._device,
+    }
+    persisted_data[self._ENV_KEY] = env_data
+
+  def LoadFrom(self, persisted_data):
+    env_data = persisted_data[self._ENV_KEY]
+    self._device = env_data[self._DEVICE_KEY]
+
   def _GetAccessToken(self):
     """Generates access token for remote device service."""
     logging.info('Generating remote service access token')
@@ -145,7 +158,7 @@ class RemoteDeviceEnvironment(environment.Environment):
           or device['available_devices_count']):
         logging.info('Found device: %s %s',
                      device['name'], device['os_version'])
-        return device['device_type_id']
+        return device
     self._NoDeviceFound(device_list)
 
   def _PrintAvailableDevices(self, device_list):
@@ -166,37 +179,42 @@ class RemoteDeviceEnvironment(environment.Environment):
     raise remote_device_helper.RemoteDeviceError('No device found.')
 
   @property
-  def device(self):
-    return self._device
+  def collect(self):
+    return self._collect
 
   @property
-  def token(self):
-    return self._access_token
+  def device_type_id(self):
+    return self._device['device_type_id']
+
+  @property
+  def only_output_failures(self):
+    # TODO(jbudorick): Remove this once b/18981674 is fixed.
+    return True
 
   @property
   def results_path(self):
     return self._results_path
 
   @property
+  def runner_package(self):
+    return self._runner_package
+
+  @property
   def runner_type(self):
     return self._runner_type
 
   @property
-  def runner_package(self):
-    return self._runner_package
+  def timeouts(self):
+    return self._timeouts
 
   @property
-  def trigger(self):
-    return self._trigger
+  def token(self):
+    return self._access_token
 
   @property
-  def collect(self):
-    return self._collect
+  def trigger(self):
+    return self._trigger
 
   @property
   def verbose_count(self):
     return self._verbose_count
-
-  @property
-  def timeouts(self):
-    return self._timeouts