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

* commit '37ac3401d7d36197fcec0d3c831069cb837ca850':
  egl emulator: fixes for covegl conformance test