Merge 'aosp/upstream-master' into 'aosp/master'

... to update Minigbm for Cuttlefish to support always using
Minigbm as its Gralloc implementation with the 2D virtio-gpu
backend and for updating the base for implementing the latest
Gralloc version.

Bug: b/123764798
Bug: b/146515640
Test: m && launch_cvd
Test: m && launch_cvd --gpu_mode=drm_virgl
Change-Id: I196928cceb6bfede8a0cd302fe93f5cc1a9c29e5

diff --cc OWNERS
index 8c05344,3c1e063..37276b3
--- 1/OWNERS
--- 2/OWNERS
+++ b/OWNERS
@@@ -1,1 -1,9 +1,1 @@@
- adelva@google.com
 -marcheu@chromium.org
 -gurchetansingh@chromium.org
 -hoegsberg@chromium.org
 -tfiga@chromium.org
 -ddavenport@chromium.org
 -dbehr@chromium.org
 -dcastagna@chromium.org
 -lepton@chromium.org
 -tutankhamen@chromium.org
++adelva@google.com

diff --cc cros_gralloc/gralloc0/gralloc0.cc
Simple merge