accommodate both new and old target-files when creating incrementals (do not merge)

Change-Id: Ibc211164bf1dee8275e15d10cbe81b63d666069f
1 file changed