Merge "Add LOCAL_LICENSE_KINDS to external/bsdiff" am: 0ca54eb3de am: dfadd2beae am: bc30369080

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic06c5431c236d31a69717e3f5f0d3b5268b6b32f