[Android] Add sharding for AMP instrumentation tests.

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 0b1dc746357d230762be93da2f42a4d13886c7a1..49d5f7021e7b9fbab28bc36dd8f38f5f7d31ff2f 100755
--- a/build/android/test_runner.py
+++ b/build/android/test_runner.py
@@ -127,18 +127,20 @@ def AddRemoteDeviceOptions(parser):
   group.add_argument('--collect',
                      help=('Only collects the test results if set. '
                            'Gets test_run_id from given file path.'))
+  group.add_argument('--num-shards', type=int,
+                     help='Number of devices to shard the test across.')
   group.add_argument('--remote-device', action='append',
                      help='Device type to run test on.')
-  group.add_argument('--results-path',
-                     help='File path to download results to.')
+  group.add_argument('--results-dir',
+                     help='Directory to put the downloaded results files in.')
   group.add_argument('--api-protocol',
                      help='HTTP protocol to use. (http or https)')
   group.add_argument('--api-address',
                      help='Address to send HTTP requests.')
   group.add_argument('--api-port',
                      help='Port to send HTTP requests to.')
-  group.add_argument('--runner-type',
-                     help='Type of test to run as.')
+  group.add_argument('--test-framework',
+                     help='Test framework to run test.')
   group.add_argument('--runner-package',
                      help='Package name of test.')
   group.add_argument('--device-type',