diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock
index 46cf8773747f..68abe90ed27a 100644
--- a/components/servo/Cargo.lock
+++ b/components/servo/Cargo.lock
@@ -39,7 +39,7 @@ source = "git+https://github.com/tomaka/android-rs-glue#5a68056599fb498b0cf3715f
 [[package]]
 name = "azure"
 version = "0.1.0"
-source = "git+https://github.com/servo/rust-azure#3e5daf667a62f702dc16285e923464458bef785f"
+source = "git+https://github.com/servo/rust-azure#c666eaaae316a1ec73144e5242f8dafbbaa13575"
 dependencies = [
  "core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation)",
  "core_graphics 0.1.0 (git+https://github.com/servo/rust-core-graphics)",
diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock
index 292f9c0e2afb..b153d21e4a5e 100644
--- a/ports/cef/Cargo.lock
+++ b/ports/cef/Cargo.lock
@@ -37,7 +37,7 @@ source = "git+https://github.com/tomaka/android-rs-glue#5a68056599fb498b0cf3715f
 [[package]]
 name = "azure"
 version = "0.1.0"
-source = "git+https://github.com/servo/rust-azure#3e5daf667a62f702dc16285e923464458bef785f"
+source = "git+https://github.com/servo/rust-azure#c666eaaae316a1ec73144e5242f8dafbbaa13575"
 dependencies = [
  "core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation)",
  "core_graphics 0.1.0 (git+https://github.com/servo/rust-core-graphics)",
diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock
index 0f29369ed46c..1d026e69f275 100644
--- a/ports/gonk/Cargo.lock
+++ b/ports/gonk/Cargo.lock
@@ -31,7 +31,7 @@ source = "git+https://github.com/tomaka/android-rs-glue#5a68056599fb498b0cf3715f
 [[package]]
 name = "azure"
 version = "0.1.0"
-source = "git+https://github.com/servo/rust-azure#3e5daf667a62f702dc16285e923464458bef785f"
+source = "git+https://github.com/servo/rust-azure#c666eaaae316a1ec73144e5242f8dafbbaa13575"
 dependencies = [
  "core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation)",
  "core_graphics 0.1.0 (git+https://github.com/servo/rust-core-graphics)",
diff --git a/ports/gonk/fake-ld.sh b/ports/gonk/fake-ld.sh
index a03caea63229..53c55259be00 100755
--- a/ports/gonk/fake-ld.sh
+++ b/ports/gonk/fake-ld.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-arm-linux-androideabi-g++ $@ $LDFLAGS -pie -lGLESv2 -lsupc++  -L$GONKDIR/prebuilts/ndk/9/sources/cxx-stl/gnu-libstdc++/4.6/libs/armeabi/ -L$GONKDIR/backup-flame/system/lib/
+arm-linux-androideabi-g++ $@ $LDFLAGS -pie -lGLESv2 -L$GONKDIR/backup-flame/system/lib/
diff --git a/python/servo/command_base.py b/python/servo/command_base.py
index 5b3ad797c030..b4118619f51a 100644
--- a/python/servo/command_base.py
+++ b/python/servo/command_base.py
@@ -181,10 +181,12 @@ def build_env(self, gonk=False, hosts_file_path=None):
                                "-isystem %(gonkdir)s/bionic/libm/include -I%(gonkdir)s/system -I%(gonkdir)s/system/core/include "
                                "-isystem %(gonkdir)s/bionic -I%(gonkdir)s/frameworks/native/opengl/include -I%(gonkdir)s/external/zlib "
                                "-I%(gonkdir)s/hardware/libhardware/include/hardware/") % {"gonkdir": env["GONKDIR"], "archdir": env["ARCH_DIR"] }
-            env["CXXFLAGS"] = ("-O2 -mandroid -fPIC  %(cppflags)s -I%(gonkdir)s/ndk/sources/cxx-stl/stlport/stlport "
-                                "-I%(gonkdir)s/ndk/sources/cxx-stl/system/include") % {"gonkdir": env["GONKDIR"], "cppflags": env["CPPFLAGS"] }
-            env["CFLAGS"] = ("-O2 -mandroid -fPIC  %(cppflags)s -I%(gonkdir)s/ndk/sources/cxx-stl/stlport/stlport "
-                             "-I%(gonkdir)s/ndk/sources/cxx-stl/system/include") % {"gonkdir": env["GONKDIR"], "cppflags": env["CPPFLAGS"] }
+            env["CXXFLAGS"] = ("-O2 -mandroid -fPIC -isystem %(gonkdir)s/api/cpp/include -isystem %(gonkdir)s/ndk/sources/cxx-stl/stlport/stlport "
+                               "-isystem %(gonkdir)s/bionic -isystem %(gonkdir)s/bionic/libstdc++/include %(cppflags)s ") % \
+                               {"gonkdir": env["GONKDIR"], "cppflags": env["CPPFLAGS"] }
+            env["CFLAGS"] = ("-O2 -mandroid -fPIC -isystem %(gonkdir)s/api/cpp/include -isystem %(gonkdir)s/ndk/sources/cxx-stl/stlport/stlport "
+                             "-isystem %(gonkdir)s/bionic -isystem %(gonkdir)s/bionic/libstdc++/include %(cppflags)s ") % \
+                             {"gonkdir": env["GONKDIR"], "cppflags": env["CPPFLAGS"] }
 
             another_extra_path = path.join(env["GONKDIR"], "prebuilts", "gcc", "linux-x86", "arm", "arm-linux-androideabi-4.7", "bin")
             env["PATH"] = "%s%s%s" % (another_extra_path, os.pathsep, env["PATH"])