Merge "llvm setup.mk and config.mk"