[xbuild] More tweaks to tool path setup