Merge "Fix java version detection when _JAVA_OPTIONS is set."