Index: .arcconfig
===================================================================
--- .arcconfig
+++ .arcconfig
@@ -1,4 +1,4 @@
 {
   "project_id" : "zorg",
-  "conduit_uri" : "http://reviews.llvm.org/"
+  "conduit_uri" : "https://reviews.llvm.org/"
 }
Index: zorg/buildbot/builders/LLDBBuilder.py
===================================================================
--- zorg/buildbot/builders/LLDBBuilder.py
+++ zorg/buildbot/builders/LLDBBuilder.py
@@ -948,6 +948,13 @@
               property="got_revision",
               workdir="scripts"))
 
+    # Update NDK and create toolchains
+    getShellCommandStep(f, name='ndk download and toolchains update',
+                        command=[pathSep + 'updateToolChain' + scriptExt],
+                        description=["Update NDK toolchain"],
+                        flunkOnFailure=False,
+                        warnOnFailure=False)
+
     # Configure
     getShellCommandStep(f, name='cmake local',
                         command=[pathSep + 'cmake' + scriptExt])