[Android] Install SystemWebView.apk for SystemWebViewShellLayoutTest.apk.

scripts/slave/recipe_modules/chromium_android/api.py

Index: scripts/slave/recipe_modules/chromium_android/api.py
diff --git a/scripts/slave/recipe_modules/chromium_android/api.py b/scripts/slave/recipe_modules/chromium_android/api.py
index 0d0de51c38e18c2f744168001071c75590c0d51e..97adf4b0e683220c6e6d5d365778cdee7fc2576b 100644
--- a/scripts/slave/recipe_modules/chromium_android/api.py
+++ b/scripts/slave/recipe_modules/chromium_android/api.py
@@ -713,11 +713,11 @@ class AndroidApi(recipe_api.RecipeApi):
       args.extend(['--test-apk', test_apk])
     if apk_under_test:
       args.extend(['--apk-under-test', apk_under_test])
+    for a in additional_apks or []:
+      args.extend(['--additional-apk', a])
 
     if not wrapper_script_suite_name:
       args.insert(0, 'instrumentation')
-      for a in additional_apks or []:
-        args.extend(['--additional-apk', a])
       if isolate_file_path:
         args.extend(['--isolate-file-path', isolate_file_path])
       if self.m.chromium.c.BUILD_CONFIG == 'Release':