diff --git a/build.gradle b/build.gradle
index 424586b7c..98f3d8373 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.0-beta05'
+        classpath 'com.android.tools.build:gradle:4.0.0-rc01'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
 
diff --git a/geeksville-androidlib b/geeksville-androidlib
index 1e1371bda..c55dcf407 160000
--- a/geeksville-androidlib
+++ b/geeksville-androidlib
@@ -1 +1 @@
-Subproject commit 1e1371bdaf79ddb2ca2baf8b312d355875984921
+Subproject commit c55dcf40797a1fc2d157860849b5cad2595a1940