Merge changes from topic "kotlin_kythe" into main am: 6556d043 am: d6663871

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



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