Commit gradlew.bat, plus attempt at fixes.  These fixes are not yet complete.