diff --git a/bin/templates/project/cordova.gradle b/bin/templates/project/cordova.gradle
index f552a470..6c7d0ab3 100644
--- a/bin/templates/project/cordova.gradle
+++ b/bin/templates/project/cordova.gradle
@@ -84,9 +84,13 @@ int compareVersions(String a, String b) {
 
 String getAndroidSdkDir() {
     def rootDir = project.rootDir
+    def androidSdkDir = null
+    String envVar = System.getenv("ANDROID_HOME")
     def localProperties = new File(rootDir, 'local.properties')
-    def androidSdkDir = ""
-    if (localProperties.exists()) {
+    String systemProperty = System.getProperty("android.home")
+    if (envVar != null) {
+        androidSdkDir = envVar
+    } else if (localProperties.exists()) {
         Properties properties = new Properties()
         localProperties.withInputStream { instr ->
             properties.load(instr)
@@ -98,23 +102,16 @@ String getAndroidSdkDir() {
             sdkDirProp = properties.getProperty('android.dir')
             if (sdkDirProp != null) {
                 androidSdkDir = (new File(rootDir, sdkDirProp)).getAbsolutePath()
-            } else {
-                throw new RuntimeException(
-                        "No sdk.dir property defined in local.properties file.")
-            }
-        }
-    } else {
-        String envVar = System.getenv("ANDROID_HOME")
-        if (envVar != null) {
-            androidSdkDir = envVar
-        } else {
-            String property = System.getProperty("android.home")
-            if (property != null) {
-                androidSdkDir = property
             }
         }
     }
-    println androidSdkDir
+    if (androidSdkDir == null && systemProperty != null) {
+        androidSdkDir = systemProperty
+    }
+    if (androidSdkDir == null) {
+        throw new RuntimeException(
+            "Unable to determine Android SDK directory.")
+    }
     androidSdkDir
 }
 
diff --git a/framework/assets/www/cordova.js b/framework/assets/www/cordova.js
index 3838e63f..c9e69350 100644
--- a/framework/assets/www/cordova.js
+++ b/framework/assets/www/cordova.js
@@ -1,5 +1,5 @@
 // Platform: android
-// 3.7.0-dev-8f41e8d
+// 3.7.0-dev-1258511
 /*
  Licensed to the Apache Software Foundation (ASF) under one
  or more contributor license agreements.  See the NOTICE file
@@ -19,7 +19,7 @@
  under the License.
 */
 ;(function() {
-var CORDOVA_JS_BUILD_LABEL = '3.7.0-dev-8f41e8d';
+var CORDOVA_JS_BUILD_LABEL = '3.7.0-dev-1258511';
 // file: src/scripts/require.js
 
 /*jshint -W079 */