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

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

Change-Id: I12402c255b2a7465e5bd2a7a577360ff96f71f8c