Merge "Add tool to diff two target files packages"