Merge "goldfish-opengl: always use local virtgpu_drm.h" am: 10c5cc3a2f am: 95ee5a1a39

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

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