Merge "Fix race with host_dlopen_handles_" into nyc-dev