Merge "Fix JDK check for USE_MINGW=1."