Backport the upstream changes that allow us to build the xtests without running them during the build. They can be very slow, so this saves a bit of build time.
