Merge "Add zhangkelvin@ as owner to bsdiff"