am 2319e183: Merge "egl emulator: fixes for covegl conformance test"

* commit '2319e1831264b7d6eac57b6c6f15ea343b22150b':
  egl emulator: fixes for covegl conformance test