MesaLib: re-apply the llvm-3.3 patches.