Merge "vulkan: fix compile error with latest AHB changes" into main