Do we need to also push the patch onto the update-vulkan-headers-staging 
branch? I suppose the patch series mainly tries to solve the build 
failures introduced by the vulkan-header update patch series.