CB-7325 Fix error message in android_sdk_version.js when missing SDK on windows

github: close #113
CB-3445: Read project.properties to configure gradle libraries
Merge branch 'master' into 4.0.x (Gradle library dependencies)
Fix previous merges

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