Merge "Put back LLVM_PREBUILTS_BASE." am: c921add339 am: 3dadeece2a
am: 9d581bbcdb

Change-Id: I4eaa1d0c11b1e4659405c022e460d042090c89ac