Merge "Add zhangkelvin@ as owner to bsdiff" am: 03442a10c4 am: ee614bda9b am: e9f44d4f51

Original change: https://android-review.googlesource.com/c/platform/external/bsdiff/+/1930681

Change-Id: Ic405e8d12a5c4d25dcf21e7fb174dfa4d3a60b0a