Merge "goldfish-opengl: remove unused code"