Revert of Aura on Android: Remove unnecessary dependencies on ui/android....

Revert of Aura on Android: Remove unnecessary dependencies on ui/android. (patchset #6 id:100001 of https://codereview.chromium.org/1460633005/ )

Reason for revert:
Reverting, since Android Aura has been cancelled.

Original issue's description:
> Aura on Android:Remove unnecessary dependencies on ui/android.
>
> BUG=NONE
>
> Committed: https://crrev.com/d2ff47131f1a53a712adf860275a2f7320d9da9f
> Cr-Commit-Position: refs/heads/master@{#360835}

TBR=sievers@chromium.org,moshayedi@chromium.org
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=NONE

Review URL: https://codereview.chromium.org/1646693002

Cr-Commit-Position: refs/heads/master@{#371928}

content/app/BUILD.gn

@@ -3,7 +3,6 @@
 # found in the LICENSE file.
 
 import("//build/config/chrome_build.gni")
-import("//build/config/ui.gni")
 
 content_app_sources = [
   "android/app_jni_registrar.cc",
@@ -50,10 +49,8 @@ if (is_win) {
     "//device/vibration",
     "//skia",
     "//third_party/android_tools:cpu_features",
+    "//ui/android",
   ]
-  if (!use_aura) {
-    content_app_deps += [ "//ui/android" ]
-  }
 }
 
 if (is_ios) {

content/browser/BUILD.gn

@@ -383,7 +383,6 @@ source_set("browser") {
               ".",
               "//content")
       sources -= [ "renderer_host/begin_frame_observer_proxy.cc" ]
-      deps += [ "//ui/android" ]
     }
 
     deps -= [ "//device/battery" ]
@@ -392,6 +391,7 @@ source_set("browser") {
       "//media",
       "//media/mojo/interfaces",
       "//mojo/android:libsystem_java",
+      "//ui/android",
     ]
     defines += [ "APPCACHE_USE_SIMPLE_CACHE" ]
     libs += [ "jnigraphics" ]

content/test/BUILD.gn

@@ -178,7 +178,7 @@ source_set("test_support") {
     ]
   }
 
-  if (is_android && !use_aura) {
+  if (is_android) {
     deps += [
       "//ui/android",
       "//ui/shell_dialogs",