Merge "vservices: Fix LLVM compilation errors for vservice drivers"