Merging under test java into instrumentation test java.

build/config/android/rules.gni

Index: build/config/android/rules.gni
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
index 35be87bd3d76bd25c55bcf65a4b5c27264f05b10..06e0ff1dfa143d4ee3554b5758e7dd578d0c9e22 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -2289,6 +2289,15 @@ if (enable_java_templates) {
         data_deps += invoker.additional_apks
       }
 
+      if (defined(invoker.proguard_enabled) && invoker.proguard_enabled) {
+        # When ProGuard is on, we use ProGuard to combine the under test java
+        # code and the test java code. This is to allow us to apply all ProGuard
+        # optimizations that we ship with, but not have them break tests. The
+        # apk under test will still have the same resources, assets, and
+        # manifest, all of which are the ones used in the tests.
+        proguard_configs = [ "//testing/android/proguard_for_test.flags" ]
+      }
+
       create_dist_ijar = true
       if (defined(invoker.run_findbugs_override)) {
         # Only allow findbugs when there are java files.