Android: Remove 64-bit targets from 32-bit build config

The targets adjusted here should never have existed on 32-bit build
configurations.

Additionally, be more explicit about the various configurations in
64-bit targets.  Currently, the extra arguments may not be used, but in
follow-on changes, they will be.

Bug: 1027573
Change-Id: I42efc07618a7bfa64a04dd8d1b6c5ccc79076ef2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1934837Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Changwan Ryu <changwan@chromium.org>
Commit-Queue: Christopher Grant <cjgrant@chromium.org>
Cr-Commit-Position: refs/heads/master@{#719251}

android_webview/BUILD.gn

@@ -822,6 +822,7 @@ if (public_android_sdk) {
     }
   }
 
+  if (android_64bit_target_cpu) {
     system_webview_apk_tmpl("trichrome_webview_64_32_apk") {
       android_manifest = trichrome_webview_64_32_android_manifest
       android_manifest_dep =
@@ -837,4 +838,5 @@ if (public_android_sdk) {
         static_library_provider = "//chrome/android:trichrome_library_apk"
       }
     }
+  }
 }

chrome/android/BUILD.gn

@@ -1806,6 +1806,7 @@ if (public_android_sdk) {
     }
   }
 
+  if (android_64bit_target_cpu) {
     trichrome_library_apk_tmpl("trichrome_library_64_32_apk") {
       apk_name = "TrichromeLibrary6432"
       android_manifest = trichrome_library_64_32_android_manifest
@@ -1813,7 +1814,8 @@ if (public_android_sdk) {
       is_64_bit_browser = true
 
       if (trichrome_synchronized_proguard) {
-      shared_resources_whitelist_target = "//android_webview:system_webview_apk"
+        shared_resources_whitelist_target =
+            "//android_webview:system_webview_apk"
         shared_resources_whitelist_locales = locales
         static_library_dependent_targets = [
           {
@@ -1827,6 +1829,7 @@ if (public_android_sdk) {
         ]
       }
     }
+  }
 }
 
 # TODO(estevenson): Remove this once we switch to using bundle targets to