diff --git a/support/magicleap/Servo2D/Servo2D.mabu b/support/magicleap/Servo2D/Servo2D.mabu
index 60404f038ea..43d6fe26b3f 100644
--- a/support/magicleap/Servo2D/Servo2D.mabu
+++ b/support/magicleap/Servo2D/Servo2D.mabu
@@ -14,10 +14,14 @@ LIBPATHS.debug = \
 LIBPATHS.release = \
     ../../../target/magicleap/aarch64-linux-android/release
 
+LDFLAGS.device = \
+    -L$(MLSDK)/lumin/stl/libc++/lib
+
 STLIBS = \
     mlservo
 
 SHLIBS = \
+    c++abi \
     log \
     z
 
diff --git a/support/magicleap/fake-ld.sh b/support/magicleap/fake-ld.sh
index 9e6f7ca7132..634f1c324bf 100755
--- a/support/magicleap/fake-ld.sh
+++ b/support/magicleap/fake-ld.sh
@@ -11,7 +11,7 @@ set -o pipefail
 MAGICLEAP_TOOLCHAIN=${MAGICLEAP_TOOLCHAIN:-"${MAGICLEAP_SDK}/tools/toolchains"}
 TARGET=${TARGET:-"aarch64-linux-android"}
 LD=${LD:-"${MAGICLEAP_TOOLCHAIN}/bin/${TARGET}-ld"}
-LDFLAGS=${LDFLAGS:-"-L${MAGICLEAP_SDK}/lumin/stl/libc++/lib -L${MAGICLEAP_SDK}/lumin/usr/lib -L${MAGICLEAP_TOOLCHAIN}/lib/gcc/${TARGET}/4.9.x ${MAGICLEAP_SDK}/lumin/usr/lib/crtbegin_so.o"}
+LDFLAGS=${LDFLAGS:-"-L${MAGICLEAP_SDK}/lumin/stl/libc++/lib -L${MAGICLEAP_SDK}/lumin/usr/lib -L${MAGICLEAP_TOOLCHAIN}/lib/gcc/${TARGET}/4.9.x"}
 
 # Remove the -landroid flag, grr
 ARGS=("$@")