diff --git a/astrid/build.gradle b/astrid/build.gradle
index ecaba2f96..42e832118 100644
--- a/astrid/build.gradle
+++ b/astrid/build.gradle
@@ -60,7 +60,7 @@ android {
 android.applicationVariants.all { variant ->
     variant.mergeResources.doLast {
         if (project.hasProperty('gapiKey')) {
-            File values = file("${buildDir}/res/all/${variant.dirName}/values/values.xml")
+            File values = file("${buildDir}/intermediates/res/${variant.dirName}/values/values.xml")
             values.write(
                     values.getText('UTF-8').replaceAll(/<string name="gapi_key">.*<\/string>/, "<string name=\"gapi_key\">${project.property('gapiKey')}</string>"),
                     'UTF-8')
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 3c7abdf12..0087cd3b1 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ