Revert "Merge remote-tracking branch 'upstream/master' into HEAD"

This reverts commit 433d87a572a15be1581679fc47d17faf3ac6b241.

Reason for revert: Build breakage.

Original change's description:
> Merge remote-tracking branch 'upstream/master' into HEAD
>
> While 21.0 is just about to get released, there's already two months
> between the 21.0 branch point and today.
>
> Change-Id: I33a37db7f703ba5ccfdd4bfcf9434d71fbd12735

Change-Id: I0d2ae0a0c4c78cf8f54105f755df0ea7c7410137
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/mesa/+/2763242
Auto-Submit: Kristian H. Kristensen <hoegsberg@chromium.org>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: Manoj Gupta <manojgupta@chromium.org>
1999 files changed