Merge branch '2.9.x' of https://git-wip-us.apache.org/repos/asf/cordo…

…va-android into 2.9.x

Dealing with the retagging of cordova.js

Updating for 2.8.1

CB-3584: Something went weird in the repo. This time for real.

Merge branch '2.8.x' of https://git-wip-us.apache.org/repos/asf/cordo…

…va-android into 2.8.x

Updating JS for Android

cordova-js wasn't properly auto-incremented either

Prep for 2.6.0 final

JS Changed once again, this will require a retag of 2.6.0rc1

Preparing to tag 2.5.0