Merge change If007a2fa into eclair

* changes:
  return proper error code from eglCreateImageKHR