Merge "fix a dead-lock in eglMakeCurrent"