Merge "Make llvm library vendor available" am: bfd195336d
am: 05187e9b2c

Change-Id: Ie5d8b3c67ccebbec569521520ab4be83bb0a294f