Merge "Fix GCH preview not working w/ minigbm" am: 93ae9108bb am: e81122e725

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

Change-Id: I3d99c40b76c82ae2eac0c2895fddc693dda54f34