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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7a766a1086b81d4682c08433f5716b2170f881d3