am 85743bc8: am 37ac3401: am 2319e183: Merge "egl emulator: fixes for covegl conformance test"

* commit '85743bc8e6e3ffe3238a61aed5d87ba308c2af82':
  egl emulator: fixes for covegl conformance test