Parallelize telemetry unit tests on Android bots

tools/telemetry/telemetry/core/device_finder.py

Index: tools/telemetry/telemetry/core/device_finder.py
diff --git a/tools/telemetry/telemetry/core/device_finder.py b/tools/telemetry/telemetry/core/device_finder.py
index dbe011558cbf5bc7eef9160ae86de7312690f17a..c5346145e784738b0bdc5d1cc487031ab547c916 100644
--- a/tools/telemetry/telemetry/core/device_finder.py
+++ b/tools/telemetry/telemetry/core/device_finder.py
@@ -21,25 +21,24 @@ DEVICES = [
 ]
 
 
-def GetAllAvailableDevices(options):
+def _GetAllAvailableDevices(options):
   """Returns a list of all available devices."""
   devices = []
   for device in DEVICES:
     devices.extend(device.FindAllAvailableDevices(options))
-  devices.sort(key=lambda device: device.name)
   return devices
 
 
-def GetAllAvailableDeviceNames(options):
-  """Returns a list of all available device names."""
-  devices = GetAllAvailableDevices(options)
-  device_names = [device.name for device in devices]
-  return device_names
-
+def GetDevicesMatchingOptions(options):
+  """Returns a list of devices matching the options."""
+  devices = []
+  if not options.device or options.device == 'list':
+    devices = _GetAllAvailableDevices(options)
+  elif options.device == 'android':
+    devices = android_device.FindAllAvailableDevices(options)
+  else:
+    devices = _GetAllAvailableDevices(options)
+    devices = [d for d in devices if d.guid == options.device]
 
-def GetSpecifiedDevices(options):
-  """Returns the specified devices."""
-  assert options.device and options.device != 'list'
-  devices = GetAllAvailableDevices(options)
-  devices = [d for d in devices if d.guid == options.device]
-  return devices
+  devices.sort(key=lambda device: device.name)
+  return devices