Android NDK r21 Beta 2 (build 6011959)
Make LLVM available for vendor
am: 7986a0ec58

Change-Id: I2b7ff64862187f2f4f75169ccc330e5ed14de382