Merge "Fix potential race condition on dlopen"