Merge "Side llvm with gcc 4.8"