diff --git a/android/demo/build.gradle b/android/demo/build.gradle
index 1a1417ecf7..3a5ec7deb2 100644
--- a/android/demo/build.gradle
+++ b/android/demo/build.gradle
@@ -14,8 +14,16 @@ android {
   }
 
   aaptOptions.ignoreAssetsPattern "!*.ttf"
+
+  buildTypes {
+    debug {
+      debuggable true
+      jniDebuggable true
+    }
+  }
 }
 
 dependencies {
-  compile project(":tangram")
+  debugCompile project(path: ':tangram', configuration: 'slimDebug')
+  releaseCompile project(path: ':tangram', configuration: 'slimRelease')
 }
diff --git a/android/tangram/build.gradle b/android/tangram/build.gradle
index 779ee72538..ec79d14e41 100644
--- a/android/tangram/build.gradle
+++ b/android/tangram/build.gradle
@@ -8,13 +8,6 @@ apply from: 'versioning.gradle'
 
 android {
   compileSdkVersion 25
-
-  /*
-   * Ubuntu can't run the aapt on 64 bit before installing this packages
-   *    sudo apt-get install lib32stdc++6
-   *    sudo apt-get install lib32z1
-   */
-
   buildToolsVersion '25.0.0'
 
   defaultConfig {
@@ -44,6 +37,15 @@ android {
     }
   }
 
+  productFlavors {
+    slim {
+      // Default configuration
+    }
+    full {
+      externalNativeBuild.cmake.abiFilters 'armeabi', 'arm64-v8a', 'x86'
+    }
+  }
+  publishNonDefault true
 }
 
 dependencies {