Merge "Include license texts and kinds for VNDK snapshot" am: 38488965

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2525584



Change-Id: I3cb08520b884c2aae25232e150031b31669483c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>