Merge "Remove duplicate license_kind." am: c4218615d3

Original change: https://android-review.googlesource.com/c/platform/prebuilts/tools/+/2294497

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