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

Change-Id: I426cd1b6e9d84e25fcc25a42266325d44abadf42