[CB-2914] Cli script migration for windows jscript
[CB-2914] Cli script migration for unix bash
Merge branch 'cordova-lib' of git://github.com/bennmapes/cordova-android into scripts
Merge branches 'scripts' and 'master'