am 3041b7d1: am 3cf20570: Merge "Use new variable LLVM_PREBUILTS_VERSION to simplify path construction."

* commit '3041b7d1f4f457082f8de50bba31adb479731d36':
  Use new variable LLVM_PREBUILTS_VERSION to simplify path construction.