Merge "Fix kernel build tools" into main am: 7d76e8cc am: 1236c42c am:...

Merge "Fix kernel build tools" into main am: 7d76e8cc am: 1236c42c am: 993d4417 am: 3190792d

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



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