Merge "Use kapt stubs for kotlin header jar for javac" am: 40f8c757 am: c139d442 am: da9b9971

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



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