Merge "Revert "Use kapt stubs for kotlin header jar for javac"" am: c7bb9d47...

Merge "Revert "Use kapt stubs for kotlin header jar for javac"" am: c7bb9d47 am: 7d2d0e6d am: ef91866a

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



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