Update to new Cordova-Android 4.0.x