libcore: Fix more merge fallout.
llvm: Unrevert change