--- a/include/utils/StrongPointer.h	2018-04-25 18:42:34.321003602 +0200
+++ b/include/utils/StrongPointer.h	2018-04-25 18:42:42.180912201 +0200
@@ -17,8 +17,6 @@
 #ifndef ANDROID_STRONG_POINTER_H
 #define ANDROID_STRONG_POINTER_H
 
-#include <cutils/atomic.h>
-
 #include <stdint.h>
 #include <sys/types.h>
 #include <stdlib.h>
--- a/libutils/Trace.cpp	2018-04-25 20:41:48.775049786 +0200
+++ b/libutils/Trace.cpp	2018-04-25 20:42:13.674744182 +0200
@@ -21,5 +21,7 @@
 
 static void traceInit()
 {
+#if defined(__ANDROID__)
     ::android::add_sysprop_change_callback(atrace_update_tags, 0);
+#endif
 }
lue='a5ec61d5359edad32edc883d1bfb3e12376839aa'/><input type='hidden' name='showmsg' value='1'/><select name='h' onchange='this.form.submit();'>
<option value='koszko' selected='selected'>koszko</option>
<option value='koszko-scripts'>koszko-scripts</option>
</select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>Wojtek's customized Guix</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=a5ec61d5359edad32edc883d1bfb3e12376839aa'>refs</a><a class='active' href='/guix/log/tests/test.drv?showmsg=1'>log</a><a href='/guix/tree/tests/test.drv?id=a5ec61d5359edad32edc883d1bfb3e12376839aa'>tree</a><a href='/guix/commit/tests/test.drv?id=a5ec61d5359edad32edc883d1bfb3e12376839aa'>commit</a><a href='/guix/diff/tests/test.drv?id=a5ec61d5359edad32edc883d1bfb3e12376839aa'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/tests/test.drv'>
<input type='hidden' name='id' value='a5ec61d5359edad32edc883d1bfb3e12376839aa'/><input type='hidden' name='showmsg' value='1'/><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=a5ec61d5359edad32edc883d1bfb3e12376839aa&amp;showmsg=1'>root</a>/<a href='/guix/log/tests?id=a5ec61d5359edad32edc883d1bfb3e12376839aa&amp;showmsg=1'>tests</a>/<a href='/guix/log/tests/test.drv?id=a5ec61d5359edad32edc883d1bfb3e12376839aa&amp;showmsg=1'>test.drv</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/tests/test.drv?id=a5ec61d5359edad32edc883d1bfb3e12376839aa'>Collapse</a>)</th><th class='left'>Author</th></tr>