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

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



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