Merge "goldfish-opengl: use Mesa provided libraries" into main