Merge "Add input dependencies to .img targets"