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

content/app/android/library_loader_hooks.cc

Index: content/app/android/library_loader_hooks.cc
diff --git a/content/app/android/library_loader_hooks.cc b/content/app/android/library_loader_hooks.cc
index 9e45b0c90628abad2234b47b38e46f01f69a1e0d..0d36b85924e6cc001eddc9c9bd1248298bf5617d 100644
--- a/content/app/android/library_loader_hooks.cc
+++ b/content/app/android/library_loader_hooks.cc
@@ -62,6 +62,11 @@
     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;
 
@@ -80,13 +85,8 @@
     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;
   }