diff --git a/app/build.gradle b/app/build.gradle
index 532f1f4109..98a1a14162 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -64,24 +64,23 @@ android {
         }
     }
 
-    flavorDimensions 'cpuArch'
-    productFlavors {
-        arm {
-            dimension 'cpuArch'
-            ndk {
-                abiFilters 'arm64-v8a', 'armeabi-v7a'
-            }
-        }
-        x86 {
-            dimension 'cpuArch'
-            ndk {
-                abiFilters 'x86_64', 'x86'
-            }
-        }
-        universal {
-            dimension 'cpuArch'
-            // include all default ABIs. with NDK-r16,  it is:
-            //   armeabi-v7a, arm64-v8a, x86, x86_64
+    splits {
+        // Configures multiple APKs based on ABI.
+        abi {
+            // Enables building multiple APKs per ABI.
+            enable true
+
+            // By default all ABIs are included, so use reset() and include to specify that we only
+            // want APKs for x86 and x86_64.
+
+            // Resets the list of ABIs that Gradle should create APKs for to none.
+            reset()
+
+            // Specifies a list of ABIs that Gradle should create APKs for.
+            include "x86", "x86_64", "armeabi-v7a", "arm64-v8a"
+
+            // Specifies that we do not want to also generate a universal APK that includes all ABIs.
+            universalApk true
         }
     }
 }