Merge "Copy directory name before closedir in Zygote"