Merge "egl emulator: fixes for covegl conformance test"