Merge "fix logging of eglMakeCurrent() errors"