Merge "emulator opengl: Added glFinishRoundTrip to GLESv2"