Snap for 4513660 from 39389d0b14a29d46742d0a0ea13d952ade832054 to studio-3.1-release

Change-Id: Ife20eeebc2d1ed58dd28343cade163459943307c
diff --git a/BUILD b/BUILD
index d36a762..ff71bc7 100644
--- a/BUILD
+++ b/BUILD
@@ -12,12 +12,13 @@
     visibility = ["//visibility:public"],
     # do not sort: must match IML order
     runtime_deps = [
-        "//tools/idea:credential-store",
-        "//tools/idea:tasks-platform-impl",
-        "//tools/idea:json",
-        "//tools/idea:relaxng",
+        "//tools/idea/platform/credential-store",
+        "//tools/idea/platform/tasks-platform-impl",
+        "//tools/idea/json",
+        "//tools/idea/xml/relaxng",
         "//tools/idea/java/compiler/instrumentation-util-8",
         "//tools/idea/plugins/maven:maven2-server-impl",
+        "//tools/adt/idea/adt-branding",
         "//tools/vendor/intellij/cidr:doxygen",
     ],
     # do not sort: must match IML order
@@ -33,9 +34,9 @@
         "//tools/idea/platform/indexing-api[module]",
         "//tools/idea/xml/xml-psi-api[module]",
         "//tools/idea/platform/projectModel-api[module]",
-        "//tools/idea:lang-impl[module]",
+        "//tools/idea/platform/lang-impl[module]",
         "//tools/idea/platform/lang-api[module]",
-        "//tools/idea:dom-openapi[module]",
+        "//tools/idea/xml/dom-openapi[module]",
         "//tools/idea/java/java-psi-api[module]",
         "//tools/idea/java/java-psi-impl[module]",
         "//tools/idea/plugins/groovy/groovy-psi[module]",