i965: Fix build after merge of mesa stable branch.