Merge "bsdiff: Redo the gyp file"