ui: Move android C++ source files into base/android directory.

ui/ui.gyp

Index: ui/ui.gyp
diff --git a/ui/ui.gyp b/ui/ui.gyp
index a38f8590bc6bdbccee0df6a7191094d1967046a6..18ebe56fe1f3de49efcdedc05d579e67f8babde8 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -42,14 +42,10 @@
         'gfx/gfx.gyp:gfx',
       ],
       'sources' : [
-        'android/ui_jni_registrar.cc',
-        'android/ui_jni_registrar.h',
-        'android/view_android.cc',
-        'android/view_android.h',
-        'android/window_android.cc',
-        'android/window_android.h',
         'base/accelerators/accelerator.cc',
         'base/accelerators/accelerator.h',
+        'base/accelerators/accelerator_manager.cc',
+        'base/accelerators/accelerator_manager.h',
         'base/accelerators/menu_label_accelerator_util_linux.cc',
         'base/accelerators/menu_label_accelerator_util_linux.h',
         'base/accelerators/platform_accelerator.h',
@@ -57,13 +53,17 @@
         'base/accelerators/platform_accelerator_cocoa.mm',
         'base/accelerators/platform_accelerator_gtk.cc',
         'base/accelerators/platform_accelerator_gtk.h',
-        'base/accelerators/accelerator_manager.cc',
-        'base/accelerators/accelerator_manager.h',
         'base/accessibility/accessibility_types.h',
         'base/accessibility/accessible_text_utils.cc',
         'base/accessibility/accessible_text_utils.h',
         'base/accessibility/accessible_view_state.cc',
         'base/accessibility/accessible_view_state.h',
+        'base/android/ui_jni_registrar.cc',
+        'base/android/ui_jni_registrar.h',
+        'base/android/view_android.cc',
+        'base/android/view_android.h',
+        'base/android/window_android.cc',
+        'base/android/window_android.h',
         'base/base_window.cc',
         'base/base_window.h',
         'base/clipboard/clipboard.cc',
@@ -134,10 +134,10 @@
         'base/cursor/cursor_loader_null.cc',
         'base/cursor/cursor_loader_null.h',
         'base/cursor/cursor_loader_win.cc',
-        'base/cursor/cursor_null.cc',
         'base/cursor/cursor_loader_win.h',
         'base/cursor/cursor_loader_x11.cc',
         'base/cursor/cursor_loader_x11.h',
+        'base/cursor/cursor_null.cc',
         'base/cursor/cursor_win.cc',
         'base/cursor/cursor_x11.cc',
         'base/cursor/cursors_aura.cc',
@@ -163,10 +163,10 @@
         'base/dragdrop/gtk_dnd_util.h',
         'base/dragdrop/os_exchange_data.cc',
         'base/dragdrop/os_exchange_data.h',
-        'base/dragdrop/os_exchange_data_provider_aurax11.cc',
-        'base/dragdrop/os_exchange_data_provider_aurax11.h',
         'base/dragdrop/os_exchange_data_provider_aura.cc',
         'base/dragdrop/os_exchange_data_provider_aura.h',
+        'base/dragdrop/os_exchange_data_provider_aurax11.cc',
+        'base/dragdrop/os_exchange_data_provider_aurax11.h',
         'base/dragdrop/os_exchange_data_provider_win.cc',
         'base/dragdrop/os_exchange_data_provider_win.h',
         'base/gtk/event_synthesis_gtk.cc',
@@ -196,8 +196,8 @@
         'base/l10n/l10n_font_util.h',
         'base/l10n/l10n_util.cc',
         'base/l10n/l10n_util.h',
-        'base/l10n/l10n_util_android.h',
         'base/l10n/l10n_util_android.cc',
+        'base/l10n/l10n_util_android.h',
         'base/l10n/l10n_util_collator.h',
         'base/l10n/l10n_util_mac.h',
         'base/l10n/l10n_util_mac.mm',