Merge "goldfish-opengl: fix Fuchsia build"