Refactoring the URI handling on Cordova, removing dead code

(cherry picked from commit b0b628ffc24bdd952e86908cf6cb4064b6f3c405)

Conflicts:
	framework/src/org/apache/cordova/CordovaWebView.java
	framework/src/org/apache/cordova/CordovaWebViewClient.java
	framework/src/org/apache/cordova/IceCreamCordovaWebViewClient.java
Update the errorurl to no longer use intents

(cherry picked from commit 6f21a96238a298a94cb66bfa4f2a969f768cea69)

Conflicts:
	framework/src/org/apache/cordova/Config.java
	framework/src/org/apache/cordova/CordovaActivity.java
Manually apply fix for CVE3501
CVE3502 - manually apply patch 0001
Added Log.e when Config is not initialised but accessed

(cherry picked from commit d260d0c18259f44393309ab661ecdd023f0cfaaf)
Manually apply patch 0002 for CVE3502
Whoops, shouldn't be using CordovaActivity
CordovaActivity was accidently added, use DroidGap instead
Add IBM-MODIFICATIONS.txt