Merge "applypatch: Use bsdiff from external/bsdiff."