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

Change-Id: I1da666f886eb051ddedde1d5db8823ffd58ee8a2