Prep for 2.6.0 final
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-android into gutting
Updating plugins
Accidentally copied non-plugin Cordova files in core, whoops