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

* commit '5fd128dcbd645f6f77f55d518569c74c0febaf3f':
  egl emulator: fixes for covegl conformance test