Fixing the build with 12.2 tools

We're trying to get everything to build with the 12.2 tools so that we can ensure it continues to build with buildbot. Here's a patch that makes this repository build.