Merge remote-tracking branch 'goog/mirror-aosp-master' into 'goog/sc-v2-dev' am: d1770ed2e4

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/minigbm/+/16407714

Change-Id: I330323af77c0059602689837b219c82e56379b1f