Merge "Add LOCAL_LICENSE_KINDS to external/bsdiff"