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

Change-Id: I90c78974817f5452815989ef584d30d83e17af49