Improve copying of additional files from the previous result after retry

Ensure that if the same child directory exists in the old and new
result directory, the contents of the old child directory exist in the
new child directory.

bug:34720468
Change-Id: If05de2fa51e5052f399c745ba0d5b15f26d7cf54
1 file changed