[jjo, r=navarrow] add contrib/uvtool-multi-bridge.diff