diff --git a/.idea/libraries/analytics_protos.xml b/.idea/libraries/analytics_protos.xml
new file mode 100644
index 000000000000..9caf8b11d3de
--- /dev/null
+++ b/.idea/libraries/analytics_protos.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="analytics-protos" type="repository">
+    <properties maven-id="com.android.tools.analytics-library:protos:26.0.0" />
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/android/tools/analytics-library/protos/26.0.0/protos-26.0.0.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/protobuf/protobuf-java/3.0.0/protobuf-java-3.0.0.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/archive_patcher.xml b/.idea/libraries/archive_patcher.xml
new file mode 100644
index 000000000000..e6e00cbc5e23
--- /dev/null
+++ b/.idea/libraries/archive_patcher.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="archive-patcher">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/android/android/lib/explainer.jar!/" />
+      <root url="jar://$PROJECT_DIR$/android/android/lib/generator.jar!/" />
+      <root url="jar://$PROJECT_DIR$/android/android/lib/shared.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/baksmali.xml b/.idea/libraries/baksmali.xml
new file mode 100644
index 000000000000..85627127198e
--- /dev/null
+++ b/.idea/libraries/baksmali.xml
@@ -0,0 +1,10 @@
+<component name="libraryTable">
+  <library name="baksmali">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/android/android/lib/baksmali-2.2.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/android/android/lib/util-2.2.1.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/com_android_tools_analytics_library_shared_26_0_0.xml b/.idea/libraries/com_android_tools_analytics_library_shared_26_0_0.xml
new file mode 100644
index 000000000000..195e79790a02
--- /dev/null
+++ b/.idea/libraries/com_android_tools_analytics_library_shared_26_0_0.xml
@@ -0,0 +1,10 @@
+<component name="libraryTable">
+  <library name="com.android.tools.analytics-library:shared:26.0.0" type="repository">
+    <properties include-transitive-deps="false" maven-id="com.android.tools.analytics-library:shared:26.0.0" />
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/android/tools/analytics-library/shared/26.0.0/shared-26.0.0.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/com_android_tools_analytics_library_tracker_26_0_0.xml b/.idea/libraries/com_android_tools_analytics_library_tracker_26_0_0.xml
new file mode 100644
index 000000000000..129d775b35e1
--- /dev/null
+++ b/.idea/libraries/com_android_tools_analytics_library_tracker_26_0_0.xml
@@ -0,0 +1,10 @@
+<component name="libraryTable">
+  <library name="com.android.tools.analytics-library:tracker:26.0.0" type="repository">
+    <properties include-transitive-deps="false" maven-id="com.android.tools.analytics-library:tracker:26.0.0" />
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/android/tools/analytics-library/tracker/26.0.0/tracker-26.0.0.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/com_android_tools_layoutlib_layoutlib_api_26_0_0.xml b/.idea/libraries/com_android_tools_layoutlib_layoutlib_api_26_0_0.xml
new file mode 100644
index 000000000000..6122049e71ac
--- /dev/null
+++ b/.idea/libraries/com_android_tools_layoutlib_layoutlib_api_26_0_0.xml
@@ -0,0 +1,19 @@
+<component name="libraryTable">
+  <library name="com.android.tools.layoutlib:layoutlib-api:26.0.0" type="repository">
+    <properties maven-id="com.android.tools.layoutlib:layoutlib-api:26.0.0" />
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/android/tools/layoutlib/layoutlib-api/26.0.0/layoutlib-api-26.0.0.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/android/tools/common/26.0.0/common-26.0.0.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/guava/guava/22.0/guava-22.0.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/errorprone/error_prone_annotations/2.0.18/error_prone_annotations-2.0.18.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/j2objc/j2objc-annotations/1.1/j2objc-annotations-1.1.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/mojo/animal-sniffer-annotations/1.14/animal-sniffer-annotations-1.14.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/android/tools/annotations/26.0.0/annotations-26.0.0.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/intellij/annotations/12.0/annotations-12.0.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/dexlib2.xml b/.idea/libraries/dexlib2.xml
index b38e3790e09d..e8044243b570 100644
--- a/.idea/libraries/dexlib2.xml
+++ b/.idea/libraries/dexlib2.xml
@@ -1,8 +1,7 @@
 <component name="libraryTable">
   <library name="dexlib2">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/android/android/lib/dexlib2-2.0.8-dev.jar!/" />
-      <root url="jar://$PROJECT_DIR$/android/android/lib/dexlib2-util-2.0.8-dev.jar!/" />
+      <root url="jar://$PROJECT_DIR$/android/android/lib/dexlib2-2.2.1.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/equalsverifier.xml b/.idea/libraries/equalsverifier.xml
new file mode 100644
index 000000000000..9bab63f7680f
--- /dev/null
+++ b/.idea/libraries/equalsverifier.xml
@@ -0,0 +1,10 @@
+<component name="libraryTable">
+  <library name="equalsverifier" type="repository">
+    <properties maven-id="nl.jqno.equalsverifier:equalsverifier:2.1.5" />
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/nl/jqno/equalsverifier/equalsverifier/2.1.5/equalsverifier-2.1.5.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/fest_swing.xml b/.idea/libraries/fest_swing.xml
index 728ad922d14e..ca0d6a5343ea 100644
--- a/.idea/libraries/fest_swing.xml
+++ b/.idea/libraries/fest_swing.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="fest-swing" type="repository">
-    <properties include-transitive-deps="false" maven-id="org.jetbrains.intellij.deps:fest-swing:1.4.2" />
+    <properties include-transitive-deps="false" maven-id="org.jetbrains.intellij.deps:fest-swing:1.4.3" />
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/fest-swing/1.4.2/fest-swing-1.4.2.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/fest-swing/1.4.3/fest-swing-1.4.3.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/mockito_2.xml b/.idea/libraries/mockito_2.xml
new file mode 100644
index 000000000000..feafb8c41a7e
--- /dev/null
+++ b/.idea/libraries/mockito_2.xml
@@ -0,0 +1,18 @@
+<component name="libraryTable">
+  <library name="mockito-2" type="repository">
+    <properties maven-id="org.mockito:mockito-core:2.11.0" />
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-core/2.11.0/mockito-core-2.11.0.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy/1.7.4/byte-buddy-1.7.4.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy-agent/1.7.4/byte-buddy-agent-1.7.4.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/objenesis/objenesis/2.6/objenesis-2.6.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-core/2.11.0/mockito-core-2.11.0-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy/1.7.4/byte-buddy-1.7.4-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy-agent/1.7.4/byte-buddy-agent-1.7.4-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/objenesis/objenesis/2.6/objenesis-2.6-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/protobuf.xml b/.idea/libraries/protobuf.xml
index 63f5ad6173d2..581a4b86597e 100644
--- a/.idea/libraries/protobuf.xml
+++ b/.idea/libraries/protobuf.xml
@@ -1,12 +1,12 @@
 <component name="libraryTable">
   <library name="protobuf" type="repository">
-    <properties maven-id="com.google.protobuf:protobuf-java:2.5.0" />
+    <properties maven-id="com.google.protobuf:protobuf-java:3.0.0" />
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/protobuf/protobuf-java/3.0.0/protobuf-java-3.0.0.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/protobuf/protobuf-java/3.0.0/protobuf-java-3.0.0-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 91246aeeec48..1c416c9c2a4d 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -17,9 +17,10 @@
       <module fileurl="file://$PROJECT_DIR$/aether-dependency-resolver/aether-dependency-resolver.iml" filepath="$PROJECT_DIR$/aether-dependency-resolver/aether-dependency-resolver.iml" group="community" />
       <module fileurl="file://$PROJECT_DIR$/platform/analysis-api/analysis-api.iml" filepath="$PROJECT_DIR$/platform/analysis-api/analysis-api.iml" group="platform" />
       <module fileurl="file://$PROJECT_DIR$/platform/analysis-impl/analysis-impl.iml" filepath="$PROJECT_DIR$/platform/analysis-impl/analysis-impl.iml" group="platform" />
+      <module fileurl="file://$PROJECT_DIR$/android/tools-base/apkparser/analyzer/analyzer.iml" filepath="$PROJECT_DIR$/android/tools-base/apkparser/analyzer/analyzer.iml" group="android/sdktools" />
       <module fileurl="file://$PROJECT_DIR$/android/android/android.iml" filepath="$PROJECT_DIR$/android/android/android.iml" group="android" />
       <module fileurl="file://$PROJECT_DIR$/android/tools-base/annotations/android-annotations.iml" filepath="$PROJECT_DIR$/android/tools-base/annotations/android-annotations.iml" group="android" />
-      <module fileurl="file://$PROJECT_DIR$/android/common/android-common.iml" filepath="$PROJECT_DIR$/android/common/android-common.iml" group="android" />
+      <module fileurl="file://$PROJECT_DIR$/android/android-common/android-common.iml" filepath="$PROJECT_DIR$/android/android-common/android-common.iml" group="android" />
       <module fileurl="file://$PROJECT_DIR$/android/jps-plugin/android-jps-plugin.iml" filepath="$PROJECT_DIR$/android/jps-plugin/android-jps-plugin.iml" group="android" />
       <module fileurl="file://$PROJECT_DIR$/android/android-plugin/android-plugin.iml" filepath="$PROJECT_DIR$/android/android-plugin/android-plugin.iml" group="android" />
       <module fileurl="file://$PROJECT_DIR$/android/rt/android-rt.iml" filepath="$PROJECT_DIR$/android/rt/android-rt.iml" group="android" />
@@ -32,11 +33,12 @@
       <module fileurl="file://$PROJECT_DIR$/plugins/ant/jps-plugin/ant-jps-plugin.iml" filepath="$PROJECT_DIR$/plugins/ant/jps-plugin/ant-jps-plugin.iml" group="plugins" />
       <module fileurl="file://$PROJECT_DIR$/jps/antLayout/antlayout.iml" filepath="$PROJECT_DIR$/jps/antLayout/antlayout.iml" group="jps" />
       <module fileurl="file://$PROJECT_DIR$/plugins/google-app-engine/runtime/appEngine-runtime.iml" filepath="$PROJECT_DIR$/plugins/google-app-engine/runtime/appEngine-runtime.iml" group="plugins/GAE" />
-      <module fileurl="file://$PROJECT_DIR$/android/tools-base/asset-studio/assetstudio.iml" filepath="$PROJECT_DIR$/android/tools-base/asset-studio/assetstudio.iml" group="android/sdktools" />
+      <module fileurl="file://$PROJECT_DIR$/android/artwork/artwork.iml" filepath="$PROJECT_DIR$/android/artwork/artwork.iml" group="android" />
       <module fileurl="file://$PROJECT_DIR$/android/tools-base/apkparser/binary-resources/binary-resources.iml" filepath="$PROJECT_DIR$/android/tools-base/apkparser/binary-resources/binary-resources.iml" group="android/sdktools" />
       <module fileurl="file://$PROJECT_DIR$/platform/boot/boot.iml" filepath="$PROJECT_DIR$/platform/boot/boot.iml" group="platform" />
       <module fileurl="file://$PROJECT_DIR$/platform/bootstrap/bootstrap.iml" filepath="$PROJECT_DIR$/platform/bootstrap/bootstrap.iml" group="platform" />
       <module fileurl="file://$PROJECT_DIR$/build/build.iml" filepath="$PROJECT_DIR$/build/build.iml" />
+      <module fileurl="file://$PROJECT_DIR$/android/build-common/build-common.iml" filepath="$PROJECT_DIR$/android/build-common/build-common.iml" group="android" />
       <module fileurl="file://$PROJECT_DIR$/android/tools-base/build-system/builder-model/builder-model.iml" filepath="$PROJECT_DIR$/android/tools-base/build-system/builder-model/builder-model.iml" group="android/sdktools" />
       <module fileurl="file://$PROJECT_DIR$/android/tools-base/build-system/builder-test-api/builder-test-api.iml" filepath="$PROJECT_DIR$/android/tools-base/build-system/builder-test-api/builder-test-api.iml" group="android/sdktools" />
       <module fileurl="file://$PROJECT_DIR$/platform/built-in-server/built-in-server.iml" filepath="$PROJECT_DIR$/platform/built-in-server/built-in-server.iml" group="platform" />
@@ -100,6 +102,8 @@
       <module fileurl="file://$PROJECT_DIR$/platform/external-system-api/external-system-api.iml" filepath="$PROJECT_DIR$/platform/external-system-api/external-system-api.iml" group="platform" />
       <module fileurl="file://$PROJECT_DIR$/platform/external-system-impl/external-system-impl.iml" filepath="$PROJECT_DIR$/platform/external-system-impl/external-system-impl.iml" group="platform" />
       <module fileurl="file://$PROJECT_DIR$/platform/external-system-rt/external-system-rt.iml" filepath="$PROJECT_DIR$/platform/external-system-rt/external-system-rt.iml" group="platform" />
+      <module fileurl="file://$PROJECT_DIR$/android/tools-base/fakeadbserver/fakeadbserver.iml" filepath="$PROJECT_DIR$/android/tools-base/fakeadbserver/fakeadbserver.iml" group="android" />
+      <module fileurl="file://$PROJECT_DIR$/android/tools-base/flags/flags.iml" filepath="$PROJECT_DIR$/android/tools-base/flags/flags.iml" group="android" />
       <module fileurl="file://$PROJECT_DIR$/java/compiler/forms-compiler/forms-compiler.iml" filepath="$PROJECT_DIR$/java/compiler/forms-compiler/forms-compiler.iml" group="java/compiler" />
       <module fileurl="file://$PROJECT_DIR$/platform/forms_rt/forms_rt.iml" filepath="$PROJECT_DIR$/platform/forms_rt/forms_rt.iml" group="platform" />
       <module fileurl="file://$PROJECT_DIR$/plugins/git4idea/git4idea.iml" filepath="$PROJECT_DIR$/plugins/git4idea/git4idea.iml" group="plugins/VCS" />
@@ -142,6 +146,8 @@
       <module fileurl="file://$PROJECT_DIR$/java/java-impl/java-impl.iml" filepath="$PROJECT_DIR$/java/java-impl/java-impl.iml" group="java" />
       <module fileurl="file://$PROJECT_DIR$/java/java-indexing-api/java-indexing-api.iml" filepath="$PROJECT_DIR$/java/java-indexing-api/java-indexing-api.iml" group="java" />
       <module fileurl="file://$PROJECT_DIR$/java/java-indexing-impl/java-indexing-impl.iml" filepath="$PROJECT_DIR$/java/java-indexing-impl/java-indexing-impl.iml" group="java" />
+      <module fileurl="file://$PROJECT_DIR$/android/tools-base/build-system/java-lib-plugin/java-lib-model/java-lib-model.iml" filepath="$PROJECT_DIR$/android/tools-base/build-system/java-lib-plugin/java-lib-model/java-lib-model.iml" group="android/sdktools" />
+      <module fileurl="file://$PROJECT_DIR$/android/tools-base/build-system/java-lib-plugin/java-lib-model-builder/java-lib-model-builder.iml" filepath="$PROJECT_DIR$/android/tools-base/build-system/java-lib-plugin/java-lib-model-builder/java-lib-model-builder.iml" group="android/sdktools" />
       <module fileurl="file://$PROJECT_DIR$/java/java-psi-api/java-psi-api.iml" filepath="$PROJECT_DIR$/java/java-psi-api/java-psi-api.iml" group="java" />
       <module fileurl="file://$PROJECT_DIR$/java/java-psi-impl/java-psi-impl.iml" filepath="$PROJECT_DIR$/java/java-psi-impl/java-psi-impl.iml" group="java" />
       <module fileurl="file://$PROJECT_DIR$/java/java-runtime/java-runtime.iml" filepath="$PROJECT_DIR$/java/java-runtime/java-runtime.iml" group="java" />
@@ -179,6 +185,7 @@
       <module fileurl="file://$PROJECT_DIR$/platform/lang-api/lang-api.iml" filepath="$PROJECT_DIR$/platform/lang-api/lang-api.iml" group="platform" />
       <module fileurl="file://$PROJECT_DIR$/platform/lang-impl/lang-impl.iml" filepath="$PROJECT_DIR$/platform/lang-impl/lang-impl.iml" group="platform" />
       <module fileurl="file://$PROJECT_DIR$/platform/lang-impl/lang-tests.iml" filepath="$PROJECT_DIR$/platform/lang-impl/lang-tests.iml" group="platform" />
+      <module fileurl="file://$PROJECT_DIR$/android/tools-base/layoutinspector/layoutinspector.iml" filepath="$PROJECT_DIR$/android/tools-base/layoutinspector/layoutinspector.iml" group="android" />
       <module fileurl="file://$PROJECT_DIR$/android/layoutlib/layoutlib.iml" filepath="$PROJECT_DIR$/android/layoutlib/layoutlib.iml" group="android/sdktools" />
       <module fileurl="file://$PROJECT_DIR$/android/tools-base/layoutlib-api/layoutlib-api.iml" filepath="$PROJECT_DIR$/android/tools-base/layoutlib-api/layoutlib-api.iml" group="android/sdktools" />
       <module fileurl="file://$PROJECT_DIR$/android/tools-base/layoutlib-resources.iml" filepath="$PROJECT_DIR$/android/tools-base/layoutlib-resources.iml" group="android/sdktools" />
@@ -206,6 +213,7 @@
       <module fileurl="file://$PROJECT_DIR$/plugins/maven/maven30-server-impl/maven30-server-impl.iml" filepath="$PROJECT_DIR$/plugins/maven/maven30-server-impl/maven30-server-impl.iml" group="plugins/maven" />
       <module fileurl="file://$PROJECT_DIR$/android/tools-base/ninepatch/ninepatch.iml" filepath="$PROJECT_DIR$/android/tools-base/ninepatch/ninepatch.iml" group="android/sdktools" />
       <module fileurl="file://$PROJECT_DIR$/android/observable/observable.iml" filepath="$PROJECT_DIR$/android/observable/observable.iml" group="android" />
+      <module fileurl="file://$PROJECT_DIR$/android/observable-ui/observable-ui.iml" filepath="$PROJECT_DIR$/android/observable-ui/observable-ui.iml" group="android" />
       <module fileurl="file://$PROJECT_DIR$/java/openapi/openapi.iml" filepath="$PROJECT_DIR$/java/openapi/openapi.iml" group="java" />
       <module fileurl="file://$PROJECT_DIR$/android/perfd-host/perfd-host.iml" filepath="$PROJECT_DIR$/android/perfd-host/perfd-host.iml" group="android" />
       <module fileurl="file://$PROJECT_DIR$/android/tools-base/perflib/perflib.iml" filepath="$PROJECT_DIR$/android/tools-base/perflib/perflib.iml" group="android/sdktools" />
@@ -218,6 +226,7 @@
       <module fileurl="file://$PROJECT_DIR$/platform/platform-resources-en/platform-resources-en.iml" filepath="$PROJECT_DIR$/platform/platform-resources-en/platform-resources-en.iml" group="platform" />
       <module fileurl="file://$PROJECT_DIR$/platform/platform-tests/platform-tests.iml" filepath="$PROJECT_DIR$/platform/platform-tests/platform-tests.iml" group="platform" />
       <module fileurl="file://$PROJECT_DIR$/android/profilers/profilers.iml" filepath="$PROJECT_DIR$/android/profilers/profilers.iml" group="android" />
+      <module fileurl="file://$PROJECT_DIR$/android/profilers-android/profilers-android.iml" filepath="$PROJECT_DIR$/android/profilers-android/profilers-android.iml" group="android" />
       <module fileurl="file://$PROJECT_DIR$/android/profilers-ui/profilers-ui.iml" filepath="$PROJECT_DIR$/android/profilers-ui/profilers-ui.iml" group="android" />
       <module fileurl="file://$PROJECT_DIR$/platform/projectModel-api/projectModel-api.iml" filepath="$PROJECT_DIR$/platform/projectModel-api/projectModel-api.iml" group="platform" />
       <module fileurl="file://$PROJECT_DIR$/platform/projectModel-impl/projectModel-impl.iml" filepath="$PROJECT_DIR$/platform/projectModel-impl/projectModel-impl.iml" group="platform" />
@@ -265,6 +274,7 @@
       <module fileurl="file://$PROJECT_DIR$/plugins/settings-repository/settings-repository.iml" filepath="$PROJECT_DIR$/plugins/settings-repository/settings-repository.iml" group="plugins" />
       <module fileurl="file://$PROJECT_DIR$/android/sherpa-ui/sherpa-ui.iml" filepath="$PROJECT_DIR$/android/sherpa-ui/sherpa-ui.iml" group="android" />
       <module fileurl="file://$PROJECT_DIR$/platform/smRunner/smRunner.iml" filepath="$PROJECT_DIR$/platform/smRunner/smRunner.iml" group="platform" />
+      <module fileurl="file://$PROJECT_DIR$/android/smali/smali.iml" filepath="$PROJECT_DIR$/android/smali/smali.iml" group="android" />
       <module fileurl="file://$PROJECT_DIR$/plugins/cvs/smartcvs-src/smartcvs-src.iml" filepath="$PROJECT_DIR$/plugins/cvs/smartcvs-src/smartcvs-src.iml" group="plugins/VCS/cvs" />
       <module fileurl="file://$PROJECT_DIR$/spellchecker/spellchecker.iml" filepath="$PROJECT_DIR$/spellchecker/spellchecker.iml" group="platform" />
       <module fileurl="file://$PROJECT_DIR$/plugins/stats-collector/stats-collector.iml" filepath="$PROJECT_DIR$/plugins/stats-collector/stats-collector.iml" group="plugins/stats-collector" />
@@ -315,6 +325,7 @@
       <module fileurl="file://$PROJECT_DIR$/platform/vcs-log/impl/vcs-log-impl.iml" filepath="$PROJECT_DIR$/platform/vcs-log/impl/vcs-log-impl.iml" group="platform/vcs-log" />
       <module fileurl="file://$PROJECT_DIR$/platform/vcs-tests/vcs-tests.iml" filepath="$PROJECT_DIR$/platform/vcs-tests/vcs-tests.iml" group="platform" />
       <module fileurl="file://$PROJECT_DIR$/android/wizard/wizard.iml" filepath="$PROJECT_DIR$/android/wizard/wizard.iml" group="android" />
+      <module fileurl="file://$PROJECT_DIR$/android/wizard-model/wizard-model.iml" filepath="$PROJECT_DIR$/android/wizard-model/wizard-model.iml" group="android" />
       <module fileurl="file://$PROJECT_DIR$/platform/xdebugger-api/xdebugger-api.iml" filepath="$PROJECT_DIR$/platform/xdebugger-api/xdebugger-api.iml" group="platform" />
       <module fileurl="file://$PROJECT_DIR$/platform/xdebugger-impl/xdebugger-impl.iml" filepath="$PROJECT_DIR$/platform/xdebugger-impl/xdebugger-impl.iml" group="platform" />
       <module fileurl="file://$PROJECT_DIR$/xml/impl/xml.iml" filepath="$PROJECT_DIR$/xml/impl/xml.iml" group="xml" />
diff --git a/community-main.iml b/community-main.iml
index 64871cc29b43..019ab74954b0 100644
--- a/community-main.iml
+++ b/community-main.iml
@@ -5,11 +5,11 @@
     <content url="file://$MODULE_DIR$" />
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="annotations" />
+    <orderEntry type="module" module-name="android" />
     <orderEntry type="module" module-name="ant" />
     <orderEntry type="module" module-name="boot" />
     <orderEntry type="module" module-name="bootstrap" />
-    <orderEntry type="module" module-name="commander" />
+    <orderEntry type="module" module-name="annotations" />
     <orderEntry type="module" module-name="compiler-impl" />
     <orderEntry type="module" module-name="compiler-openapi" />
     <orderEntry type="module" module-name="debugger-impl" />
@@ -26,7 +26,7 @@
     <orderEntry type="module" module-name="idea-ui" />
     <orderEntry type="module" module-name="java-impl" />
     <orderEntry type="module" module-name="java-runtime" />
-    <orderEntry type="module" module-name="jsp-base-openapi" />
+    <orderEntry type="module" module-name="commander" />
     <orderEntry type="module" module-name="jsp-openapi" />
     <orderEntry type="module" module-name="jsp-spi" />
     <orderEntry type="module" module-name="lang-api" />
@@ -44,7 +44,7 @@
     <orderEntry type="module" module-name="resources" />
     <orderEntry type="module" module-name="resources-en" />
     <orderEntry type="module" module-name="spellchecker" />
-    <orderEntry type="module" module-name="testFramework" />
+    <orderEntry type="module" module-name="jsp-base-openapi" />
     <orderEntry type="module" module-name="testFramework-java" />
     <orderEntry type="module" module-name="testRunner" />
     <orderEntry type="module" module-name="usageView" />
@@ -59,7 +59,7 @@
     <orderEntry type="module" module-name="java-tests" />
     <orderEntry type="module" module-name="copyright" />
     <orderEntry type="module" module-name="cvs-plugin" />
-    <orderEntry type="module" module-name="java-i18n" />
+    <orderEntry type="module" module-name="testFramework" />
     <orderEntry type="module" module-name="ui-designer" />
     <orderEntry type="module" module-name="devkit" />
     <orderEntry type="module" module-name="eclipse" />
@@ -77,7 +77,7 @@
     <orderEntry type="module" module-name="xpath" />
     <orderEntry type="module" module-name="xslt-debugger" />
     <orderEntry type="module" module-name="xslt-debugger-engine" />
-    <orderEntry type="module" module-name="tasks-core" />
+    <orderEntry type="module" module-name="java-i18n" />
     <orderEntry type="module" module-name="tasks-api" />
     <orderEntry type="module" module-name="tasks-java" />
     <orderEntry type="module" module-name="tasks-tests" />
@@ -95,7 +95,7 @@
     <orderEntry type="module" module-name="yaml" />
     <orderEntry type="module" module-name="xml-tests" scope="TEST" />
     <orderEntry type="module" module-name="devkit-jps-plugin" scope="TEST" />
-    <orderEntry type="module" module-name="jps-model-tests" scope="TEST" />
+    <orderEntry type="module" module-name="tasks-core" />
     <orderEntry type="module" module-name="jps-serialization-tests" scope="TEST" />
     <orderEntry type="module" module-name="ui-designer-jps-plugin" scope="TEST" />
     <orderEntry type="module" module-name="ui-designer-jps-plugin" scope="TEST" />
@@ -110,7 +110,7 @@
     <orderEntry type="module" module-name="json-tests" scope="TEST" />
     <orderEntry type="module" module-name="typeMigration" />
     <orderEntry type="module" module-name="platform-tests" />
-    <orderEntry type="module" module-name="android" />
+    <orderEntry type="module" module-name="jps-model-tests" scope="TEST" />
     <orderEntry type="module" module-name="diff-tests" scope="TEST" />
     <orderEntry type="module" module-name="built-in-server-tests" scope="TEST" />
     <orderEntry type="module" module-name="updater" scope="TEST" />