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 am: 37672d31

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



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