Merge "Refactor llvm_config.mk and support the 2nd arch"