--- a/adb/Android.mk	2018-04-25 23:23:29.527198350 +0200
+++ b/adb/Android.mk	2018-04-25 23:24:25.558632573 +0200
@@ -226,7 +226,7 @@
 LOCAL_SRC_FILES := test_track_devices.cpp
 LOCAL_SANITIZE := $(adb_host_sanitize)
 LOCAL_SHARED_LIBRARIES := libbase
-LOCAL_STATIC_LIBRARIES := libadb libcrypto_static libcutils
+LOCAL_STATIC_LIBRARIES := libadb libbase libcrypto_static libcutils
 LOCAL_LDLIBS += -lrt -ldl -lpthread
 include $(BUILD_HOST_EXECUTABLE)
 endif
@@ -278,6 +278,7 @@
 LOCAL_SANITIZE := $(adb_host_sanitize)
 LOCAL_STATIC_LIBRARIES := \
     libadb \
+    libcutils \
     libbase \
     libcrypto_static \
     libdiagnose_usb \
--- a/adb/sysdeps_test.cpp	2018-05-09 23:58:46.583163684 +0200
+++ b/adb/sysdeps_test.cpp	2018-05-09 23:56:41.356544648 +0200
@@ -17,6 +17,8 @@
 #include <gtest/gtest.h>
 #include <unistd.h>
 #include <atomic>
+#include <climits>
+#include <mutex>
 
 #include "adb_io.h"
 #include "sysdeps.h"
ix</td><td class='sub right'></td></tr></table>
<table class='tabs'><tr><td>
<a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=de8e3c894970938e0a1e00fff794bfb5a065d76a'>refs</a><a class='active' href='/guix/log/gnu/ci.scm'>log</a><a href='/guix/tree/gnu/ci.scm?id=de8e3c894970938e0a1e00fff794bfb5a065d76a'>tree</a><a href='/guix/commit/gnu/ci.scm?id=de8e3c894970938e0a1e00fff794bfb5a065d76a'>commit</a><a href='/guix/diff/gnu/ci.scm?id=de8e3c894970938e0a1e00fff794bfb5a065d76a'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/ci.scm'>
<input type='hidden' name='id' value='de8e3c894970938e0a1e00fff794bfb5a065d76a'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=de8e3c894970938e0a1e00fff794bfb5a065d76a'>root</a>/<a href='/guix/log/gnu?id=de8e3c894970938e0a1e00fff794bfb5a065d76a'>gnu</a>/<a href='/guix/log/gnu/ci.scm?id=de8e3c894970938e0a1e00fff794bfb5a065d76a'>ci.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/ci.scm?id=de8e3c894970938e0a1e00fff794bfb5a065d76a&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2019-08-26 13:40:46 +0200'>2019-08-26</span></td><td><a href='/guix/commit/gnu/ci.scm?id=f00ff8db9253b077ea625072d41f573cd1f73f3d'>ci: Try hard to build package replacements.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-08-14 21:29:53 +0200'>2019-08-14</span></td><td><a href='/guix/commit/gnu/ci.scm?id=67dac6b8920755cb011047157bb7b4fae4760143'>gnu: mingw: Add x86_64 support.</a><span class='msg-avail'>...</span></td><td>Carl Dong</td></tr>
<tr><td><span title='2019-07-06 16:17:24 +0200'>2019-07-06</span></td><td><a href='/guix/commit/gnu/ci.scm?id=c3ab921eed2a471022e9863a94ea521508782e53'>ci: 'channel-build-system' honors the target system.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-03-13 23:12:43 +0100'>2019-03-13</span></td><td><a href='/guix/commit/gnu/ci.scm?id=59e80445882f8b0379e54916f89510c0deda6698'>Remove traces of "GuixSD".</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-01-21 10:19:31 +0100'>2019-01-21</span></td><td><a href='/guix/commit/gnu/ci.scm?id=c680a7daa5e143dd37d1d045805e073497c591be'>ci: Skip system tests on armhf-linux.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-01-20 01:42:11 +0100'>2019-01-20</span></td><td><a href='/guix/commit/gnu/ci.scm?id=7e6d8d366a61f951936ed83371877ce006f679f6'>ci: Use a valid 'current-guix'.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-01-06 21:41:07 +0100'>2019-01-06</span></td><td><a href='/guix/commit/gnu/ci.scm?id=b5f8c2c88543158e8aca76aa98f9009f6b9e743a'>hydra: Compute jobs in an inferior.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-01-06 21:41:07 +0100'>2019-01-06</span></td><td><a href='/guix/commit/gnu/ci.scm?id=59fb5c1cdb6fa5d6d1dbeca58e33f4a01a7d98f8'>hydra: Move job definitions to (gnu ci).</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>