Revert of Aura on Android: Fix link errors when building...

Revert of Aura on Android: Fix link errors when building content_unittests_apk. (patchset #1 id:1 of https://codereview.chromium.org/1466463004/ )

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

Original issue's description:
> Aura on Android: Fix link errors when building content_unittests_apk.
>
> * Do ui::RegisterUIAndroidJni() only when not using Aura.
> * Exclude desktop_aura from the build.
>
> BUG=507792
>
> Committed: https://crrev.com/ce62351f189643118e9d09bf06e128b75345ef36
> Cr-Commit-Position: refs/heads/master@{#360942}

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

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

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

content/app/android/library_loader_hooks.cc

@@ -64,6 +64,11 @@ bool EnsureJniRegistered(JNIEnv* env) {
     if (!ui::events::android::RegisterJni(env))
       return false;
 
+#if !defined(USE_AURA)
+    if (!ui::shell_dialogs::RegisterJni(env))
+      return false;
+#endif
+
     if (!content::android::RegisterCommonJni(env))
       return false;
 
@@ -85,13 +90,8 @@ bool EnsureJniRegistered(JNIEnv* env) {
     if (!media::midi::RegisterJni(env))
       return false;
 
-#if !defined(USE_AURA)
-    if (!ui::shell_dialogs::RegisterJni(env))
-      return false;
-
     if (!ui::RegisterUIAndroidJni(env))
       return false;
-#endif
 
     g_jni_init_done = true;
   }

content/public/test/content_test_suite_base.cc

@@ -91,10 +91,10 @@ void ContentTestSuiteBase::Initialize() {
   media::RegisterJni(env);
   net::android::RegisterJni(env);
   ui::android::RegisterJni(env);
+  ui::RegisterUIAndroidJni(env);
   ui::gl::android::RegisterJni(env);
   ui::events::android::RegisterJni(env);
 #if !defined(USE_AURA)
-  ui::RegisterUIAndroidJni(env);
   ui::shell_dialogs::RegisterJni(env);
   content::Compositor::Initialize();
 #endif

ui/views/BUILD.gn

@@ -114,7 +114,7 @@ component("views") {
       "//ui/touch_selection",
       "//ui/wm",
     ]
-    if (!is_chromeos && !is_android) {
+    if (!is_chromeos) {
       sources += gypi_values.views_desktop_aura_sources
       if (use_x11) {
         sources += gypi_values.views_desktop_aura_x11_sources