[No review required] Take latest build-infra (fix build)