Merge "Don't import llvm.mk for non-portable builds."