Merge commit mesa-public/master into vulkan

This pulls in the patches that move all of the compiler stuff around