Merge branch 'master' into 4.0.x (unbreak compile)

framework/src/org/apache/cordova/CoreAndroid.java

@@ -49,7 +49,7 @@ public class CoreAndroid extends CordovaPlugin {
      * get file paths associated with the Activity.
      */
     @Override
-    public void initialize() {
+    public void pluginInitialize() {
         this.initTelephonyReceiver();
     }