Merge "Remove the include/bsdiff export."