Update from https://crrev.com/308331

build/android/pylib/base/environment_factory.py

Index: build/android/pylib/base/environment_factory.py
diff --git a/build/android/pylib/base/environment_factory.py b/build/android/pylib/base/environment_factory.py
index c96d19920f7802c5e1a5d8cff9ae6ecb941457dd..3ad39fc6f1bed1ba981b68b14081965daa55c896 100644
--- a/build/android/pylib/base/environment_factory.py
+++ b/build/android/pylib/base/environment_factory.py
@@ -2,10 +2,14 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+from pylib.remote.device import remote_device_environment
 
-def CreateEnvironment(_args, error_func):
+def CreateEnvironment(args, error_func):
 
   # TODO(jbudorick) Add local device environment.
   # TODO(jbudorick) Add local machine environment.
-  error_func('No environments currently supported.')
 
+  if args.environment == 'remote_device':
+    return remote_device_environment.RemoteDeviceEnvironment(args,
+                                                             error_func)
+  error_func('Unable to create %s environment.' % args.environment)