accommodate both new and old target-files when creating incrementals

(cherry-picked from gingerbread.)

Change-Id: I925bf122b0012302a85c0b6f04cca48eb694b0c4
1 file changed