Merge "Revert "Skip C-verification of GL headers."" into main