Merge "Depend on (bs|img)diff for target-files-package"