New structurizer

This picks up a newer version of mesa/mesa!2401 (merged). Couldn't really come up with a clean way to apply it aside from peeling back the older version and reapplying it, with a few other changes that landed in master that it now depends on.

I've verified this continues to pass our CI test suite for CL but haven't tried any CTS tests yet.

/cc @karolherbst