Merge "Revert "imgdiff: Generate statically linked imgdiff.""