CB-7980: Add 9 to versionCode for minSdk 20+ if not multiarch
CB-7980 Add --minSdkVersion and --versionCode flags to cordova/build command

These are also exposed via environment variables: ANDROID_VERSION_CODE, ANDROID_MIN_SDK_VERSION
This also fixes build.gradle modifying the value set by ANDROID_VERSION_CODE when multi-apk is enabled (override should never be modified)
Merge branch 'master' into 4.0.x (--minSdkVersion and --versionCode)

Conflicts:
	bin/templates/project/build.gradle