Pickup Harpy tooling changes from upstream into externals again.