Auto merge of #160916 - Kobzol:bootstrap-llvm-2, r=jieyouxu