adjust according to upstream changes
llvm family version bump
fix lldb build