Merge "goldfish-opengl: meson modifications for header change" am: bb1a6e3554 am: b51560c229

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

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