Merge "Semi-initial commit for xdelta3, a file diffing tool."