Merge "Separate reading old and new files from bsdiff()."