am 48240423: Merge "Fix JDK check for USE_MINGW=1."

* commit '4824042356e780153153ac7aafa6ce6e1b8df7f2':
  Fix JDK check for USE_MINGW=1.