(Reland x2) Expose resources in Robolectric/JUnit 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 cb2767e662415d00f49b3341f9a0109ec415c47d..f7eb5c1010e2de60bb52cfd388c7d6dae873af3d 100755
--- a/build/android/test_runner.py
+++ b/build/android/test_runner.py
@@ -469,6 +469,21 @@ def AddJUnitTestOptions(parser):
       dest='test_suite', required=True,
       help='JUnit test suite to run.')
 
+  # These arguments are for Android Robolectric tests.
+  parser.add_argument(
+      '--android-manifest-path',
+      help='Path to Android Manifest to configure Robolectric.')
+  parser.add_argument(
+      '--package-name',
+      help='Default app package name for Robolectric tests.')
+  parser.add_argument(
+      '--resource-zip',
+      action='append', dest='resource_zips', default=[],
+      help='Path to resource zips to configure Robolectric.')
+  parser.add_argument(
+      '--robolectric-runtime-deps-dir',
+      help='Path to runtime deps for Robolectric.')
+
 
 def AddLinkerTestOptions(parser):