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

Change-Id: Ibc211164bf1dee8275e15d10cbe81b63d666069f

pranav01/platform_manifest,xorware/android_build,RR-msm7x30/platform_manifest,xorware/android_build,xorware/android_build,xorware/android_build,ND-3500/platform_manifest,knone1/platform_manifest,see4ri/lolili,Hybrid-Power/startsync,xorware/android_build,fallouttester/platform_manifest,hagar006/platform_manifest