am 3ba55116: Merge "Don\'t import llvm.mk for non-portable builds."

* commit '3ba5511665ffd31cc766fe7774a94eb18696a845':
  Don't import llvm.mk for non-portable builds.