Merge "Fix deadlock when cleaning objects in eglTerminate"