Cleanup blimp/client/core code organization.

blimp/client/BUILD.gn

Index: blimp/client/BUILD.gn
diff --git a/blimp/client/BUILD.gn b/blimp/client/BUILD.gn
index c5b437a3244cd902910a2c41e93f3ed42e7dde44..e0e9e19334f9937e2ef7ecd766b78f718316bc43 100644
--- a/blimp/client/BUILD.gn
+++ b/blimp/client/BUILD.gn
@@ -17,8 +17,8 @@ source_set("session") {
 
   public_deps = [
     "//blimp/client/core",
-    "//blimp/client/core:switches",
     "//blimp/client/core/geolocation",
+    "//blimp/client/core/switches",
     "//blimp/common/proto",
     "//device/geolocation",
     "//ui/events",
@@ -52,8 +52,8 @@ source_set("client") {
 
   public_deps = [
     ":session",
-    "//blimp/client/core:switches",
     "//blimp/client/core/compositor",
+    "//blimp/client/core/switches",
     "//blimp/client/support",
     "//cc",
     "//cc/surfaces",
@@ -286,7 +286,7 @@ if (is_android) {
       ":blimp_java",
       "//base:base_java",
       "//base:base_java_test_support",
-      "//blimp/client/core:common_java",
+      "//blimp/client/core/common:common_java",
       "//blimp/client/core/contents:contents_java",
       "//blimp/client/core/settings:settings_java",
       "//blimp/client/public:public_headers_java",