Update cordova.js snapshot to work with bridge changes
Merge branch 'master' into 4.0.x (cordova.js snapshot)