Add multiple device/os filtering and a config file.

build/android/test_runner.py

Index: build/android/test_runner.py
diff --git a/build/android/test_runner.py b/build/android/test_runner.py
index 6eb368af41e282a8ec1f87a174afd94ff203356c..b3a92a2b5de938228130f438684b52c600554b02 100755
--- a/build/android/test_runner.py
+++ b/build/android/test_runner.py
@@ -127,10 +127,8 @@ def AddRemoteDeviceOptions(parser):
   group.add_argument('--collect', default='',
                      help=('Only collects the test results if set. '
                            'Gets test_run_id from given file path.'))
-  group.add_argument('--remote-device', default='',
+  group.add_argument('--remote-device', action='append',
                      help='Device type to run test on.')
-  group.add_argument('--remote-device-os', default='',
-                     help='OS to have on the device.')
   group.add_argument('--results-path', default='',
                      help='File path to download results to.')
   group.add_argument('--api-protocol',
@@ -143,6 +141,17 @@ def AddRemoteDeviceOptions(parser):
   group.add_argument('--device-type', default='Android',
                      choices=constants.VALID_DEVICE_TYPES,
                      help=('Type of device to run on. iOS or android'))
+  group.add_argument('--device-oem', action='append',
+                      help='Device OEM to run on.')
+  group.add_argument('--remote-device-file',
+                     help=('File with JSON to select remote device. '
+                           'Overrides all other flags.'))
+
+  device_os_group = group.add_mutually_exclusive_group()
+  device_os_group.add_argument('--remote-device-minimum-os',
+                               help='Minimum OS on device.')
+  device_os_group.add_argument('--remote-device-os', action='append',
+                               help='OS to have on the device.')
 
   api_secret_group = group.add_mutually_exclusive_group()
   api_secret_group.add_argument('--api-secret', default='',