Merge branch 'master' into StudioProjectCompat

framework/project.properties

@@ -10,7 +10,7 @@
 # Indicates whether an apk should be generated for each density.
 split.density=false
 # Project target.
-target=android-25
+target=android-26
 apk-configurations=
 renderscript.opt.level=O0
 android.library=true

framework/src/org/apache/cordova/engine/SystemWebViewEngine.java

@@ -210,11 +210,6 @@ public class SystemWebViewEngine implements CordovaWebViewEngine {
         settings.setAppCachePath(databasePath);
         settings.setAppCacheEnabled(true);
 
-        // Enable scaling
-        // Fix for CB-12015
-        settings.setUseWideViewPort(true);
-        settings.setLoadWithOverviewMode(true);
-
         // Fix for CB-1405
         // Google issue 4641
         String defaultUserAgent = settings.getUserAgentString();