Merge "Update kernel-build-tools to ab/12637358" into main