Merge "Put back LLVM_PREBUILTS_BASE."
am: c921add339

Change-Id: I06e11c06dfa37b9ef9419cbc0de35a4026ee5bf7