diff --git a/README.md b/README.md
index 18be1a567..8fdab290b 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,4 @@
 # Magisk Manager
+I used Java 8 features in the app, and official supported is added in Android Studio 2.4  
+Aware that Android Studio 2.4 is currently in the Preview Channel  
 You need to install CMake and NDK to build the zipadjust library for zip preprocessing
diff --git a/app/build.gradle b/app/build.gradle
index b3c3c47f6..10247dbc9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,9 +1,8 @@
 apply plugin: 'com.android.application'
-apply plugin: 'me.tatarka.retrolambda'
 
 android {
     compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    buildToolsVersion "26.0.0-rc1"
 
     defaultConfig {
         applicationId "com.topjohnwu.magisk"
@@ -38,11 +37,6 @@ android {
     lintOptions {
         disable 'MissingTranslation'
     }
-    retrolambda {
-        javaVersion JavaVersion.VERSION_1_7
-        defaultMethods false
-        incremental true
-    }
 }
 repositories {
     jcenter()
@@ -57,7 +51,6 @@ dependencies {
     compile 'com.android.support:design:25.3.1'
     compile 'com.android.support:support-v4:25.3.1'
     compile 'com.jakewharton:butterknife:8.5.1'
-    compile 'com.github.clans:fab:1.6.4'
     compile 'com.thoughtbot:expandablerecyclerview:1.4'
     compile 'us.feras.mdv:markdownview:1.1.0'
     compile 'com.madgag.spongycastle:core:1.54.0.0'
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index cf6277842..0189ece65 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -25,5 +25,3 @@
 -keep class org.spongycastle.** { *; }
 -dontwarn javax.naming.**
 
-# retrolambda
--dontwarn java.lang.invoke.*
diff --git a/app/src/main/java/com/topjohnwu/magisk/utils/ZipUtils.java b/app/src/main/java/com/topjohnwu/magisk/utils/ZipUtils.java
index b74388599..e0b8bbb2d 100644
--- a/app/src/main/java/com/topjohnwu/magisk/utils/ZipUtils.java
+++ b/app/src/main/java/com/topjohnwu/magisk/utils/ZipUtils.java
@@ -997,7 +997,7 @@ public class ZipUtils {
                 return manifest;
             }
             public Enumeration<JarEntry> entries() {
-                Iterator<Entry<String, Pair<JarEntry, ByteArrayOutputStream> >> i = entrySet().iterator();
+                Iterator<Map.Entry<String, Pair<JarEntry, ByteArrayOutputStream> >> i = entrySet().iterator();
                 ArrayList<JarEntry> list = new ArrayList<>();
                 while (i.hasNext())
                     list.add(i.next().getValue().first);
diff --git a/build.gradle b/build.gradle
index 25dde0734..2738ef3e2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,8 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.0'
-        classpath 'me.tatarka:gradle-retrolambda:3.6.0'
+        classpath 'com.android.tools.build:gradle:2.4.0-alpha4'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a97a6b5e7..674152fbc 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Aug 17 11:39:12 CEST 2016
+#Wed Apr 05 09:31:45 CST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-all.zip