fixed merge errors from updating cordova for android