diff --git a/bin/templates/cordova/lib/build.js b/bin/templates/cordova/lib/build.js
index 1f4810d0..77fe2597 100644
--- a/bin/templates/cordova/lib/build.js
+++ b/bin/templates/cordova/lib/build.js
@@ -156,13 +156,25 @@ var builders = {
     },
     gradle: {
         getArgs: function(cmd) {
-            var lintSteps = [
-                'lint',
-                'lintVitalRelease',
-                'compileLint',
-                'copyReleaseLint',
-                'copyDebugLint'
-            ];
+            var lintSteps;
+            if (process.env['BUILD_MULTIPLE_APKS']) {
+                lintSteps = [
+                    'lint',
+                    'lintVitalX86Release',
+                    'lintVitalArmv7Release',
+                    'compileLint',
+                    'copyReleaseLint',
+                    'copyDebugLint'
+                ];
+            } else {
+                lintSteps = [
+                    'lint',
+                    'lintVitalRelease',
+                    'compileLint',
+                    'copyReleaseLint',
+                    'copyDebugLint'
+                ];
+            }
             var args = [cmd, '-b', path.join(ROOT, 'build.gradle')];
             // 10 seconds -> 6 seconds
             args.push('-Dorg.gradle.daemon=true');
diff --git a/bin/templates/project/build.gradle b/bin/templates/project/build.gradle
index 8bccc413..9d1d45ae 100644
--- a/bin/templates/project/build.gradle
+++ b/bin/templates/project/build.gradle
@@ -41,7 +41,7 @@ android {
     compileSdkVersion 19
     buildToolsVersion "19.0.0"
 
-    if (multiarch) {
+    if (multiarch || System.env.BUILD_MULTIPLE_APKS) {
         productFlavors {
             armv7 {
                 versionCode defaultConfig.versionCode + 2