Merge "Depend on (bs|img)diff for target-files-package" am: 90151623fc am: e9e4001b34
am: 29651c25fa

Change-Id: If1f601510b7a33936c73d371a676bbcc509089f7