forked from github/cordova-android

Build scripts (create and build) were mangled somewhat by the previous merge commits. This resets them to (almost) exactly the same state as the 3.6.x (master) branch. Conflicts: bin/lib/create.js
Build scripts (create and build) were mangled somewhat by the previous merge commits. This resets them to (almost) exactly the same state as the 3.6.x (master) branch. Conflicts: bin/lib/create.js