Merge "Update bat files to not use find_java.bat"