Few more cherry-picks from mesa/master for staging/20.0 to address build issues seen with AOSP
Here are two cherry-picks from usptream for staging/20.0 that are needed (but not sufficient) for building with AOSP.
Here are two cherry-picks from usptream for staging/20.0 that are needed (but not sufficient) for building with AOSP.