Adndroid builders won't build anything

[jdm]

[armeabi] Gdbserver      : [arm-linux-androideabi-4.9] libs/armeabi/gdbserver
install -p /home/servo/android/ndk/r12b/android-ndk-r12b/prebuilt/android-arm/gdbserver/gdbserver ./libs/armeabi/gdbserver
[armeabi] Gdbsetup       : libs/armeabi/gdb.setup
echo "set solib-search-path ./obj/local/armeabi" > ./libs/armeabi/gdb.setup
echo "directory /home/servo/android/ndk/r12b/android-ndk-r12b/platforms/android-18/arch-arm/usr/include jni /home/servo/android/ndk/r12b/android-ndk-r12b/sources/cxx-stl/system" >> ./libs/armeabi/gdb.setup
[armeabi] Prebuilt       : libmain.so <= jni/armeabi/
cp -f jni/armeabi/libmain.so obj/local/armeabi/libmain.so
[armeabi] Install        : libmain.so => libs/armeabi/libmain.so
install -p ./obj/local/armeabi/libmain.so ./libs/armeabi/libmain.so
/home/servo/android/ndk/r12b/android-ndk-r12b/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/arm-linux-androideabi-strip --strip-unneeded  ./libs/armeabi/libmain.so
Copying the file "libc++_shared.so" to "/home/servo/buildbot/slave/android/build/target/arm-linux-androideabi/debug/apk/libs/armeabi/libc++_shared.so"
Error while updating the project with the android command
Cleaning up from previous packaging
Packaging Android exited with return value 1

The best guess we have is #618 is the cause. We should revert it and redeploy.