Merge "goldfish-opengl: meson modifications for header change"