Merge "Add the "bsdiff/" prefix to all include paths."