diff --git a/srcpkgs/android-tools/patches/android-tools-uchar.patch b/srcpkgs/android-tools/patches/android-tools-uchar.patch
new file mode 100644
index 00000000000..2656c43948f
--- /dev/null
+++ b/srcpkgs/android-tools/patches/android-tools-uchar.patch
@@ -0,0 +1,10 @@
+--- core/include/cutils/jstring.h.orig	2017-04-13 09:40:53.139449328 +0200
++++ core/include/cutils/jstring.h	2017-04-13 09:39:36.520748834 +0200
+@@ -19,6 +19,7 @@
+ 
+ #include <stdint.h>
+ #include <stddef.h>
++#include <uchar.h>
+ 
+ #ifdef __cplusplus
+ extern "C" {
diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index abdd4ec921a..b072a72195f 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -14,7 +14,6 @@ short_desc="Android platform tools (adb and fastboot)"
 maintainer="Eivind Uggedal <eivind@uggedal.com>"
 license="Apache-2.0 BSD GPL-2"
 homepage="http://developer.android.com/tools/help/adb.html"
-broken="https://build.voidlinux.eu/builders/armv7l_builder/builds/2106/steps/shell_3/logs/stdio"
 
 do_fetch() {
 	local r