Merge "Revert "Generate statically linked bsdiff.""