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