Merge "emulator: opengl: minor fix and reformatting"