Android S Beta 4
Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/jdiff" am: 75558173f8

Original change: https://android-review.googlesource.com/c/platform/external/jdiff/+/1588800

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I271d9278f479c803d6c3e59a2915d7cab15db9b4