Fix the regression from the mesa refactoring and from switching to armv7 in hammerhead. [ci:skip-build]: already built successfully in CI for x86_64; I've tested manually that it builds for armv7.