diff --git a/MoreTeapots/build.gradle b/MoreTeapots/build.gradle
index 5ea0c85b..4e3b4a94 100644
--- a/MoreTeapots/build.gradle
+++ b/MoreTeapots/build.gradle
@@ -14,7 +14,7 @@ buildscript {
          *    if you build locally, go to $your_src_dir/out/repo/com/android/tools/build
          *    find the version under the plugin name directory[gradle-experimental].
          */
-        classpath 'com.android.tools.build:gradle-experimental:1.3.0-beta3'
+        classpath 'com.android.tools.build:gradle-experimental:1.3.0-beta4'
     }
 }
 
diff --git a/Teapot/build.gradle b/Teapot/build.gradle
index b330d6fa..8036c2d2 100644
--- a/Teapot/build.gradle
+++ b/Teapot/build.gradle
@@ -14,7 +14,7 @@ buildscript {
          *    if you build locally, go to $your_src_dir/out/repo/com/android/tools/build
          *    find the version under the plugin name directory[gradle-experimental].
          */
-        classpath 'com.android.tools.build:gradle-experimental:1.3.0-beta3'
+        classpath 'com.android.tools.build:gradle-experimental:1.3.0-beta4'
     }
 }
 
diff --git a/bitmap-plasma/build.gradle b/bitmap-plasma/build.gradle
index b330d6fa..8036c2d2 100644
--- a/bitmap-plasma/build.gradle
+++ b/bitmap-plasma/build.gradle
@@ -14,7 +14,7 @@ buildscript {
          *    if you build locally, go to $your_src_dir/out/repo/com/android/tools/build
          *    find the version under the plugin name directory[gradle-experimental].
          */
-        classpath 'com.android.tools.build:gradle-experimental:1.3.0-beta3'
+        classpath 'com.android.tools.build:gradle-experimental:1.3.0-beta4'
     }
 }
 
diff --git a/builder/build.gradle b/builder/build.gradle
index 4a1ed541..a48ca0a3 100644
--- a/builder/build.gradle
+++ b/builder/build.gradle
@@ -12,4 +12,4 @@ dependencies {
 
 test {
     testLogging.showStandardStreams = true
-}
\ No newline at end of file
+}
diff --git a/endless-tunnel/build.gradle b/endless-tunnel/build.gradle
index d973731f..bb41d163 100644
--- a/endless-tunnel/build.gradle
+++ b/endless-tunnel/build.gradle
@@ -30,7 +30,7 @@ buildscript {
          *    if you build locally, go to $your_src_dir/out/repo/com/android/tools/build
          *    find the version under the plugin name directory[gradle-experimental].
          */
-        classpath 'com.android.tools.build:gradle-experimental:1.3.0-beta3'
+        classpath 'com.android.tools.build:gradle-experimental:1.3.0-beta4'
     }
 }
 
diff --git a/gles3jni/build.gradle b/gles3jni/build.gradle
index 6be67f63..b388f3be 100644
--- a/gles3jni/build.gradle
+++ b/gles3jni/build.gradle
@@ -14,7 +14,7 @@ buildscript {
          *    if you build locally, go to $your_src_dir/out/repo/com/android/tools/build
          *    find the version under the plugin name directory[gradle-experimental].
          */
-        classpath 'com.android.tools.build:gradle-experimental:1.3.0-beta3'
+        classpath 'com.android.tools.build:gradle-experimental:1.3.0-beta4'
     }
 }
 
diff --git a/hello-gl2/build.gradle b/hello-gl2/build.gradle
index 95241ddf..02e6e3dc 100644
--- a/hello-gl2/build.gradle
+++ b/hello-gl2/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle-experimental:1.3.0-beta3'
+        classpath 'com.android.tools.build:gradle-experimental:1.3.0-beta4'
     }
 }
 
diff --git a/hello-jni/app/build.gradle b/hello-jni/app/build.gradle
index c8480df7..3a1e44f7 100644
--- a/hello-jni/app/build.gradle
+++ b/hello-jni/app/build.gradle
@@ -34,25 +34,25 @@ model {
         // for detailed abiFilter descriptions, refer to "Supported ABIs" @
         // https://developer.android.com/ndk/guides/abis.html#sa
         create("arm") {
-            ndk.abiFilters += "armeabi"
+            ndkConfig.abiFilters += "armeabi"
         }
         create("arm7") {
-            ndk.abiFilters += "armeabi-v7a"
+            ndkConfig.abiFilters += "armeabi-v7a"
         }
         create("arm8") {
-            ndk.abiFilters += "arm64-v8a"
+            ndkConfig.abiFilters += "arm64-v8a"
         }
         create("x86") {
-            ndk.abiFilters += "x86"
+            ndkConfig.abiFilters += "x86"
         }
         create("x86-64") {
-            ndk.abiFilters += "x86_64"
+            ndkConfig.abiFilters += "x86_64"
         }
         create("mips") {
-            ndk.abiFilters += "mips"
+            ndkConfig.abiFilters += "mips"
         }
         create("mips-64") {
-            ndk.abiFilters += "mips64"
+            ndkConfig.abiFilters += "mips64"
         }
         // To include all cpu architectures, leaves abiFilters empty
         create("all")
diff --git a/hello-jni/build.gradle b/hello-jni/build.gradle
index 9c4e4b28..11b76a6a 100644
--- a/hello-jni/build.gradle
+++ b/hello-jni/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle-experimental:1.3.0-beta3'
+        classpath 'com.android.tools.build:gradle-experimental:1.3.0-beta4'
     }
 }
 
diff --git a/native-activity/build.gradle b/native-activity/build.gradle
index 6be67f63..b388f3be 100644
--- a/native-activity/build.gradle
+++ b/native-activity/build.gradle
@@ -14,7 +14,7 @@ buildscript {
          *    if you build locally, go to $your_src_dir/out/repo/com/android/tools/build
          *    find the version under the plugin name directory[gradle-experimental].
          */
-        classpath 'com.android.tools.build:gradle-experimental:1.3.0-beta3'
+        classpath 'com.android.tools.build:gradle-experimental:1.3.0-beta4'
     }
 }
 
diff --git a/native-audio/build.gradle b/native-audio/build.gradle
index 40529925..df8fd786 100644
--- a/native-audio/build.gradle
+++ b/native-audio/build.gradle
@@ -14,7 +14,7 @@ buildscript {
          *    if you build locally, go to $your_src_dir/out/repo/com/android/tools/build
          *    find the version under the plugin name directory[gradle-experimental].
          */
-        classpath 'com.android.tools.build:gradle-experimental:1.3.0-beta3'
+        classpath 'com.android.tools.build:gradle-experimental:1.3.0-beta4'
     }
 }
 
diff --git a/native-codec/build.gradle b/native-codec/build.gradle
index b330d6fa..8036c2d2 100644
--- a/native-codec/build.gradle
+++ b/native-codec/build.gradle
@@ -14,7 +14,7 @@ buildscript {
          *    if you build locally, go to $your_src_dir/out/repo/com/android/tools/build
          *    find the version under the plugin name directory[gradle-experimental].
          */
-        classpath 'com.android.tools.build:gradle-experimental:1.3.0-beta3'
+        classpath 'com.android.tools.build:gradle-experimental:1.3.0-beta4'
     }
 }
 
diff --git a/native-media/build.gradle b/native-media/build.gradle
index b330d6fa..8036c2d2 100644
--- a/native-media/build.gradle
+++ b/native-media/build.gradle
@@ -14,7 +14,7 @@ buildscript {
          *    if you build locally, go to $your_src_dir/out/repo/com/android/tools/build
          *    find the version under the plugin name directory[gradle-experimental].
          */
-        classpath 'com.android.tools.build:gradle-experimental:1.3.0-beta3'
+        classpath 'com.android.tools.build:gradle-experimental:1.3.0-beta4'
     }
 }
 
diff --git a/native-plasma/build.gradle b/native-plasma/build.gradle
index b330d6fa..8036c2d2 100644
--- a/native-plasma/build.gradle
+++ b/native-plasma/build.gradle
@@ -14,7 +14,7 @@ buildscript {
          *    if you build locally, go to $your_src_dir/out/repo/com/android/tools/build
          *    find the version under the plugin name directory[gradle-experimental].
          */
-        classpath 'com.android.tools.build:gradle-experimental:1.3.0-beta3'
+        classpath 'com.android.tools.build:gradle-experimental:1.3.0-beta4'
     }
 }
 
diff --git a/san-angeles/build.gradle b/san-angeles/build.gradle
index b330d6fa..8036c2d2 100644
--- a/san-angeles/build.gradle
+++ b/san-angeles/build.gradle
@@ -14,7 +14,7 @@ buildscript {
          *    if you build locally, go to $your_src_dir/out/repo/com/android/tools/build
          *    find the version under the plugin name directory[gradle-experimental].
          */
-        classpath 'com.android.tools.build:gradle-experimental:1.3.0-beta3'
+        classpath 'com.android.tools.build:gradle-experimental:1.3.0-beta4'
     }
 }