Merge "Update OWNERS in external/bsdiff" am: 61a6197566
am: 96d3bc1cf3

Change-Id: I9b14a015bf9a821fef9479a5fa8fcdbeac0c04a5