diff --git a/admob/build.gradle b/admob/build.gradle
index 8e409c907..3e2db7596 100644
--- a/admob/build.gradle
+++ b/admob/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0-alpha4'
+        classpath 'com.android.tools.build:gradle:2.3.3'
         classpath 'com.google.gms:google-services:3.1.0'
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/analytics/build.gradle b/analytics/build.gradle
index 8e409c907..3e2db7596 100644
--- a/analytics/build.gradle
+++ b/analytics/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0-alpha4'
+        classpath 'com.android.tools.build:gradle:2.3.3'
         classpath 'com.google.gms:google-services:3.1.0'
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/app-indexing/build.gradle b/app-indexing/build.gradle
index 8e409c907..3e2db7596 100644
--- a/app-indexing/build.gradle
+++ b/app-indexing/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0-alpha4'
+        classpath 'com.android.tools.build:gradle:2.3.3'
         classpath 'com.google.gms:google-services:3.1.0'
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/auth/build.gradle b/auth/build.gradle
index ec4824126..32ef7766a 100644
--- a/auth/build.gradle
+++ b/auth/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0-alpha4'
+        classpath 'com.android.tools.build:gradle:2.3.3'
         classpath 'com.google.gms:google-services:3.1.0'
     }
 }
diff --git a/build.gradle b/build.gradle
index 3422a676d..b0f198d7c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0-alpha4'
+        classpath 'com.android.tools.build:gradle:2.3.3'
         classpath 'com.google.gms:google-services:3.1.0'
     }
 }
diff --git a/config/build.gradle b/config/build.gradle
index 8e409c907..3e2db7596 100644
--- a/config/build.gradle
+++ b/config/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0-alpha4'
+        classpath 'com.android.tools.build:gradle:2.3.3'
         classpath 'com.google.gms:google-services:3.1.0'
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/crash/build.gradle b/crash/build.gradle
index ec6cc8866..78973d7a6 100644
--- a/crash/build.gradle
+++ b/crash/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0-alpha4'
+        classpath 'com.android.tools.build:gradle:2.3.3'
         classpath 'com.google.gms:google-services:3.1.0'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/database/build.gradle b/database/build.gradle
index ec6cc8866..78973d7a6 100644
--- a/database/build.gradle
+++ b/database/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0-alpha4'
+        classpath 'com.android.tools.build:gradle:2.3.3'
         classpath 'com.google.gms:google-services:3.1.0'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/dynamiclinks/app/build.gradle b/dynamiclinks/app/build.gradle
index ac98734ef..99c5c249d 100644
--- a/dynamiclinks/app/build.gradle
+++ b/dynamiclinks/app/build.gradle
@@ -23,8 +23,12 @@ android {
         }
     }
 
+    flavorDimensions "all"
+
     productFlavors {
         main {
+            dimension "all"
+
             // TODO(developer): Replace this with your app code
             //                  See: https://firebase.google.com/docs/dynamic-links/android/create#set-up-firebase-and-the-dynamic-links-sdk
             resValue "string", "app_code", "YOUR_APP_CODE"
diff --git a/dynamiclinks/build.gradle b/dynamiclinks/build.gradle
index 644b3b85d..bc8950bb5 100644
--- a/dynamiclinks/build.gradle
+++ b/dynamiclinks/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0-alpha4'
+        classpath 'com.android.tools.build:gradle:2.3.3'
         classpath 'com.google.gms:google-services:3.1.0'
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/invites/app/build.gradle b/invites/app/build.gradle
index 482a17f74..74c1fd895 100644
--- a/invites/app/build.gradle
+++ b/invites/app/build.gradle
@@ -23,8 +23,12 @@ android {
         }
     }
 
+    flavorDimensions "all"
+
     productFlavors {
         main {
+            dimension "all"
+
             // TODO(developer): Replace this with your app code
             //                  See: https://firebase.google.com/docs/dynamic-links/android/create#set-up-firebase-and-the-dynamic-links-sdk
             resValue "string", "app_code", "YOUR_APP_CODE"
diff --git a/invites/build.gradle b/invites/build.gradle
index 8e409c907..3e2db7596 100644
--- a/invites/build.gradle
+++ b/invites/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0-alpha4'
+        classpath 'com.android.tools.build:gradle:2.3.3'
         classpath 'com.google.gms:google-services:3.1.0'
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/messaging/build.gradle b/messaging/build.gradle
index 8e409c907..3e2db7596 100644
--- a/messaging/build.gradle
+++ b/messaging/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0-alpha4'
+        classpath 'com.android.tools.build:gradle:2.3.3'
         classpath 'com.google.gms:google-services:3.1.0'
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/perf/build.gradle b/perf/build.gradle
index 4e9703258..2654fcae5 100644
--- a/perf/build.gradle
+++ b/perf/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0-alpha4'
+        classpath 'com.android.tools.build:gradle:2.3.3'
         classpath('com.google.firebase:firebase-plugins:1.1.0') {
             // TODO This shouldn't be necessary with the next update
             exclude group: 'com.google.guava', module: 'guava-jdk5'
diff --git a/storage/build.gradle b/storage/build.gradle
index 644b3b85d..bc8950bb5 100644
--- a/storage/build.gradle
+++ b/storage/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0-alpha4'
+        classpath 'com.android.tools.build:gradle:2.3.3'
         classpath 'com.google.gms:google-services:3.1.0'
 
         // NOTE: Do not place your application dependencies here; they belong