Merging under test java into instrumentation test java.

BUILD.gn

Index: BUILD.gn
diff --git a/BUILD.gn b/BUILD.gn
index f5080c978fa077aeda0615ce4cae13915f1496b4..8f3e2e340789c1e39c2f76bb141979e20d96e9b2 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -409,16 +409,12 @@ group("both_gn_and_gyp") {
         "//android_webview/tools/system_webview_shell",
         "//chrome/android:chrome_junit_tests",
         "//chrome/android:chrome_public_apk",
+        "//chrome/android:chrome_public_test_apk",
+        "//chrome/android:chrome_sync_shell_test_apk",
         "//chrome/test/chromedriver/test/webview_shell:chromedriver_webview_shell_apk",
         "//content/shell/android:content_shell_test_apk",
         "//third_party/custom_tabs_client:custom_tabs_client_example_apk",
       ]
-      if (!enable_all_proguard_optimizations) {
-        deps += [
-          "//chrome/android:chrome_public_test_apk",
-          "//chrome/android:chrome_sync_shell_test_apk",
-        ]
-      }
     }
 
     if (target_cpu != "x64") {