### What this PR does / why we need it? - Fix broken commit by [#20927](https://github.com/vllm-project/vllm/pull/20927) - Fix broken commit by [#20466](https://github.com/vllm-project/vllm/pull/20466) - TODO: more fully adapt to the upstream reconstruction, let's first make CI happy - vLLM version: v0.9.2 - vLLM main: https://github.com/vllm-project/vllm/commit/11dfdf21bf3ab057986a7f0053704dfcfee27a4e --------- Signed-off-by: wangli <wangli858794774@gmail.com>