Merge "Fix find-jdk-tools-jar to be cygwin-friendly."