am 780c2372: accommodate both new and old target-files when creating incrementals (do not merge)
Merge commit '780c2372' into gingerbread-plus-aosp
* commit '780c2372':
accommodate both new and old target-files when creating incrementals (do not merge)