Merge \\"Switch to prebuilt clang-3016494\\" am: 8195ed10a4

am: 5662c04bae

Change-Id: Id8aed7d5cad44f8b83b3731d08762f7dafe3e1e9

cc/cc.go

@@ -193,7 +193,7 @@ func init() {
 		if override := config.(android.Config).Getenv("LLVM_PREBUILTS_VERSION"); override != "" {
 			return override, nil
 		}
-		return "clang-2812033", nil
+		return "clang-3016494", nil
 	})
 	pctx.StaticVariable("clangPath", "${clangBase}/${HostPrebuiltTag}/${clangVersion}")
 	pctx.StaticVariable("clangBin", "${clangPath}/bin")