Merge "Fix race with host_dlopen_handles_"