Merging under test java into instrumentation test java.

build/config/android/config.gni

Index: build/config/android/config.gni
diff --git a/build/config/android/config.gni b/build/config/android/config.gni
index 88f1364cf5489854bd4f03de77ce8f5b8ebe2804..fe196b918c37c422254c7f8dc1be235b63353c29 100644
--- a/build/config/android/config.gni
+++ b/build/config/android/config.gni
@@ -118,13 +118,6 @@ if (is_android) {
     # Required for Android M+ due to SELinux policies (stronger sandboxing).
     disable_incremental_isolated_processes = false
 
-    # Enables all ProGuard optimizations. These optimizations must not be
-    # enabled for instrumentation tests, since they cause code required by the
-    # tests to be removed.
-    # TODO(smaier): when buildbots get updated to set this flag, change the
-    # default to is_official_build
-    enable_all_proguard_optimizations = false
-
     # Speed up incremental compiles by compiling only changed files.
     enable_incremental_javac = false
 
@@ -136,11 +129,6 @@ if (is_android) {
     use_order_profiling = false
   }
 
-  # Ensuring we never have a situation where we are asking to have debug java
-  # on alongside all ProGuard optimizations turned on, as these are mutually
-  # exclusive.
-  assert(!(is_java_debug && enable_all_proguard_optimizations))
-
   # Neither of these should ever be used for release builds since they are
   # somewhat experimental and dx --incremental is known to not produce
   # byte-for-byte identical output.