Merge changes from topic "revert-2118020-aemu-minigbm-YPSJZXEOBJ" am: af8519d7c3

Original change: https://android-review.googlesource.com/c/device/generic/goldfish/+/2143077

Change-Id: I3ba83aaada8190c8f5fb5e47913a9d091ed62efd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>