diff --git a/plugins/android/lib/androidprefs.jar b/plugins/android/lib/androidprefs.jar
index 07fc575dcc61..30cc1f55a879 100644
Binary files a/plugins/android/lib/androidprefs.jar and b/plugins/android/lib/androidprefs.jar differ
diff --git a/plugins/android/lib/common.jar b/plugins/android/lib/common.jar
index eea8d07fe45c..b037f324950a 100644
Binary files a/plugins/android/lib/common.jar and b/plugins/android/lib/common.jar differ
diff --git a/plugins/android/lib/ddmlib.jar b/plugins/android/lib/ddmlib.jar
index b0cfae423139..4b403ef1c706 100644
Binary files a/plugins/android/lib/ddmlib.jar and b/plugins/android/lib/ddmlib.jar differ
diff --git a/plugins/android/lib/ide_common.jar b/plugins/android/lib/ide_common.jar
index 0ca81e238c58..2bb63be76656 100644
Binary files a/plugins/android/lib/ide_common.jar and b/plugins/android/lib/ide_common.jar differ
diff --git a/plugins/android/lib/layoutlib_api.jar b/plugins/android/lib/layoutlib_api.jar
index 3cb4d07bf95a..8503ba261b8e 100644
Binary files a/plugins/android/lib/layoutlib_api.jar and b/plugins/android/lib/layoutlib_api.jar differ
diff --git a/plugins/android/lib/lint.jar b/plugins/android/lib/lint.jar
index 202a03d162fb..1ed15813dd03 100644
Binary files a/plugins/android/lib/lint.jar and b/plugins/android/lib/lint.jar differ
diff --git a/plugins/android/lib/lint_api.jar b/plugins/android/lib/lint_api.jar
index 997b9f728eeb..3757ce41bdeb 100644
Binary files a/plugins/android/lib/lint_api.jar and b/plugins/android/lib/lint_api.jar differ
diff --git a/plugins/android/lib/lint_checks.jar b/plugins/android/lib/lint_checks.jar
index 921fe0d2e513..e59f47f059b4 100644
Binary files a/plugins/android/lib/lint_checks.jar and b/plugins/android/lib/lint_checks.jar differ
diff --git a/plugins/android/lib/ninepatch.jar b/plugins/android/lib/ninepatch.jar
index 81c25e9bdf9c..b66d77513513 100644
Binary files a/plugins/android/lib/ninepatch.jar and b/plugins/android/lib/ninepatch.jar differ
diff --git a/plugins/android/lib/sdklib.jar b/plugins/android/lib/sdklib.jar
index 9951c41ee485..8974466bf9ca 100644
Binary files a/plugins/android/lib/sdklib.jar and b/plugins/android/lib/sdklib.jar differ
diff --git a/plugins/android/lib/src/common_src.zip b/plugins/android/lib/src/common_src.zip
index e9936383a2e9..1f400fc1789d 100644
Binary files a/plugins/android/lib/src/common_src.zip and b/plugins/android/lib/src/common_src.zip differ
diff --git a/plugins/android/lib/src/ddmlib_src.zip b/plugins/android/lib/src/ddmlib_src.zip
index 4132c8e6c2b5..3b4a60e809f9 100644
Binary files a/plugins/android/lib/src/ddmlib_src.zip and b/plugins/android/lib/src/ddmlib_src.zip differ
diff --git a/plugins/android/lib/src/ide_common_src.zip b/plugins/android/lib/src/ide_common_src.zip
index 9f1bd2f244b8..0bb2c86fef82 100644
Binary files a/plugins/android/lib/src/ide_common_src.zip and b/plugins/android/lib/src/ide_common_src.zip differ
diff --git a/plugins/android/lib/src/layoutlib_api_src.zip b/plugins/android/lib/src/layoutlib_api_src.zip
index 5006ceb8efcb..ff78e06336b9 100644
Binary files a/plugins/android/lib/src/layoutlib_api_src.zip and b/plugins/android/lib/src/layoutlib_api_src.zip differ
diff --git a/plugins/android/lib/src/lint_api_src.zip b/plugins/android/lib/src/lint_api_src.zip
index 4ee3abf0072b..c60d99b97762 100644
Binary files a/plugins/android/lib/src/lint_api_src.zip and b/plugins/android/lib/src/lint_api_src.zip differ
diff --git a/plugins/android/lib/src/lint_checks_src.zip b/plugins/android/lib/src/lint_checks_src.zip
index 0f90e00338b9..aab0db0ecf3e 100644
Binary files a/plugins/android/lib/src/lint_checks_src.zip and b/plugins/android/lib/src/lint_checks_src.zip differ
diff --git a/plugins/android/lib/src/lint_src.zip b/plugins/android/lib/src/lint_src.zip
index af539eed36e8..d8924b9245dd 100644
Binary files a/plugins/android/lib/src/lint_src.zip and b/plugins/android/lib/src/lint_src.zip differ
diff --git a/plugins/android/lib/src/sdklib_src.zip b/plugins/android/lib/src/sdklib_src.zip
index cbe25fb98f28..5b0bca8e7da6 100644
Binary files a/plugins/android/lib/src/sdklib_src.zip and b/plugins/android/lib/src/sdklib_src.zip differ
diff --git a/plugins/android/src/org/jetbrains/android/uipreview/ProjectResources.java b/plugins/android/src/org/jetbrains/android/uipreview/ProjectResources.java
index 561c4991baf1..a3f75e480da6 100644
--- a/plugins/android/src/org/jetbrains/android/uipreview/ProjectResources.java
+++ b/plugins/android/src/org/jetbrains/android/uipreview/ProjectResources.java
@@ -110,8 +110,8 @@ public class ProjectResources extends ResourceRepository {
   }
 
   @Override
-  protected void postUpdate() {
-    super.postUpdate();
+  public void postUpdateCleanUp() {
+    super.postUpdateCleanUp();
     mergeIdResources();
   }