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

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



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