Revert of Make ui gn check pass. Misc GN build improvements.

ui/base/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/ui.gni")
 
 if (is_android) {
   import("//build/config/android/config.gni")
   import("//build/config/android/rules.gni")
 }
@@ skipping 290 matching lines @@
     "//ui/gfx",
   ]
 
   if (is_ios) {
     sources += [
       "l10n/l10n_util_mac.h",
       "l10n/l10n_util_mac.mm",
     ]
   } else {
     deps += [ "//ui/base/ime" ]
-
-    # http://crbug.com/408648 Circular includes from the ime sub-target to this
-    # one.
-    allow_circular_includes_from = [ "//ui/base/ime" ]
   }
 
   if (toolkit_views) {
     deps += [
       "//ui/events",
     ]
   }
 
   if (use_x11 && use_aura) {
     sources += [
@@ skipping 264 matching lines @@
       "../android/java/src/org/chromium/ui/base/LocalizationUtils.java",
       "../android/java/src/org/chromium/ui/base/ResourceBundle.java",
       "../android/java/src/org/chromium/ui/base/SelectFileDialog.java",
       "../android/java/src/org/chromium/ui/base/TouchDevice.java",
       "../android/java/src/org/chromium/ui/base/ViewAndroid.java",
       "../android/java/src/org/chromium/ui/base/WindowAndroid.java",
     ]
     jni_package = "base"
   }
 }