Merge "Prevent NPE in FileUtil#recursiveCopy."