Merge changes I4fc241e6,Idca71396

* changes:
  Move __system_property* to LIBC_PRIVATE for lp64 libc
  Move ndk-cruft symbols to LIBC_PRIVATE
diff --git a/libc/libc.arm.brillo.map b/libc/libc.arm.brillo.map
index 0e5f810..fb729d4 100644
--- a/libc/libc.arm.brillo.map
+++ b/libc/libc.arm.brillo.map
@@ -187,21 +187,21 @@
     __sym_ntop;
     __sym_ntos;
     __sym_ston;
-    __system_properties_init;
-    __system_property_add;
-    __system_property_area__;
-    __system_property_area_init;
-    __system_property_area_serial;
-    __system_property_find;
-    __system_property_find_nth;
-    __system_property_foreach;
-    __system_property_get;
-    __system_property_read;
-    __system_property_serial;
-    __system_property_set;
-    __system_property_set_filename;
-    __system_property_update;
-    __system_property_wait_any;
+    __system_properties_init; # arm x86 mips
+    __system_property_add; # arm x86 mips
+    __system_property_area__; # arm x86 mips
+    __system_property_area_init; # arm x86 mips
+    __system_property_area_serial; # arm x86 mips
+    __system_property_find; # arm x86 mips
+    __system_property_find_nth; # arm x86 mips
+    __system_property_foreach; # arm x86 mips
+    __system_property_get; # arm x86 mips
+    __system_property_read; # arm x86 mips
+    __system_property_serial; # arm x86 mips
+    __system_property_set; # arm x86 mips
+    __system_property_set_filename; # arm x86 mips
+    __system_property_update; # arm x86 mips
+    __system_property_wait_any; # arm x86 mips
     __timer_create; # arm x86 mips
     __timer_delete; # arm x86 mips
     __timer_getoverrun; # arm x86 mips
diff --git a/libc/libc.arm.map b/libc/libc.arm.map
index f9b7989..60ca598 100644
--- a/libc/libc.arm.map
+++ b/libc/libc.arm.map
@@ -122,7 +122,6 @@
     __pselect6; # arm x86 mips
     __pthread_cleanup_pop;
     __pthread_cleanup_push;
-    __pthread_gettid; # arm x86 mips nobrillo
     __ptrace; # arm x86 mips
     __putlong;
     __putshort;
@@ -161,7 +160,6 @@
     __sched_cpucount;
     __sched_cpufree;
     __sched_getaffinity; # arm x86 mips
-    __set_errno; # arm x86 mips nobrillo
     __set_tid_address; # arm x86 mips
     __set_tls; # arm mips
     __sF;
@@ -189,21 +187,21 @@
     __sym_ntop;
     __sym_ntos;
     __sym_ston;
-    __system_properties_init;
-    __system_property_add;
-    __system_property_area__;
-    __system_property_area_init;
-    __system_property_area_serial;
-    __system_property_find;
-    __system_property_find_nth;
-    __system_property_foreach;
-    __system_property_get;
-    __system_property_read;
-    __system_property_serial;
-    __system_property_set;
-    __system_property_set_filename;
-    __system_property_update;
-    __system_property_wait_any;
+    __system_properties_init; # arm x86 mips
+    __system_property_add; # arm x86 mips
+    __system_property_area__; # arm x86 mips
+    __system_property_area_init; # arm x86 mips
+    __system_property_area_serial; # arm x86 mips
+    __system_property_find; # arm x86 mips
+    __system_property_find_nth; # arm x86 mips
+    __system_property_foreach; # arm x86 mips
+    __system_property_get; # arm x86 mips
+    __system_property_read; # arm x86 mips
+    __system_property_serial; # arm x86 mips
+    __system_property_set; # arm x86 mips
+    __system_property_set_filename; # arm x86 mips
+    __system_property_update; # arm x86 mips
+    __system_property_wait_any; # arm x86 mips
     __timer_create; # arm x86 mips
     __timer_delete; # arm x86 mips
     __timer_getoverrun; # arm x86 mips
@@ -243,9 +241,7 @@
     android_gethostbynamefornet;
     android_set_abort_message;
     arc4random;
-    arc4random_addrandom; # arm x86 mips nobrillo
     arc4random_buf;
-    arc4random_stir; # arm x86 mips nobrillo
     arc4random_uniform;
     asctime;
     asctime64; # arm x86 mips
@@ -259,11 +255,9 @@
     atoll;
     basename;
     basename_r; # arm x86 mips
-    bcopy; # arm x86 mips nobrillo
     bind;
     bindresvport;
     brk;
-    bsd_signal; # arm x86 mips nobrillo
     bsearch;
     btowc;
     bzero; # arm x86 mips
@@ -319,7 +313,6 @@
     dup3;
     duplocale;
     endmntent;
-    endpwent; # arm x86 mips nobrillo
     endservent;
     endutent;
     environ;
@@ -366,7 +359,6 @@
     fdatasync;
     fdopen;
     fdopendir;
-    fdprintf; # arm x86 mips nobrillo
     feof;
     feof_unlocked;
     ferror;
@@ -418,7 +410,6 @@
     fsync;
     ftell;
     ftello;
-    ftime; # arm x86 mips nobrillo
     ftok;
     ftruncate;
     ftruncate64;
@@ -450,8 +441,6 @@
     getchar_unlocked;
     getcwd;
     getdelim;
-    getdents; # arm x86 mips nobrillo
-    getdtablesize; # arm x86 mips nobrillo
     getegid;
     getenv;
     geteuid;
@@ -526,7 +515,6 @@
     if_nametoindex;
     imaxabs;
     imaxdiv;
-    index; # arm x86 mips nobrillo
     inet_addr;
     inet_aton;
     inet_lnaof;
@@ -579,7 +567,6 @@
     isprint_l;
     ispunct;
     ispunct_l;
-    issetugid; # arm x86 mips nobrillo
     isspace;
     isspace_l;
     isupper;
@@ -669,7 +656,6 @@
     mempcpy;
     memrchr;
     memset;
-    memswap; # arm x86 mips nobrillo
     mincore;
     mkdir;
     mkdirat;
@@ -760,7 +746,6 @@
     pthread_attr_getschedpolicy;
     pthread_attr_getscope;
     pthread_attr_getstack;
-    pthread_attr_getstackaddr; # arm x86 mips nobrillo
     pthread_attr_getstacksize;
     pthread_attr_init;
     pthread_attr_setdetachstate;
@@ -769,7 +754,6 @@
     pthread_attr_setschedpolicy;
     pthread_attr_setscope;
     pthread_attr_setstack;
-    pthread_attr_setstackaddr; # arm x86 mips nobrillo
     pthread_attr_setstacksize;
     pthread_cond_broadcast;
     pthread_cond_destroy;
@@ -1027,8 +1011,6 @@
     strncpy;
     strndup;
     strnlen;
-    strntoimax; # arm x86 mips nobrillo
-    strntoumax; # arm x86 mips nobrillo
     strpbrk;
     strptime;
     strrchr;
@@ -1047,7 +1029,6 @@
     strtoll;
     strtoll_l;
     strtoq;
-    strtotimeval; # arm x86 mips nobrillo
     strtoul;
     strtoull;
     strtoull_l;
@@ -1069,7 +1050,6 @@
     sysinfo;
     syslog;
     system;
-    sysv_signal; # arm x86 mips nobrillo
     tcdrain;
     tcflow;
     tcflush;
@@ -1101,7 +1081,6 @@
     timerfd_settime;
     times;
     timezone;
-    tkill; # arm x86 mips nobrillo
     tmpfile;
     tmpnam;
     toascii;
@@ -1143,7 +1122,6 @@
     vdprintf;
     verr;
     verrx;
-    vfdprintf; # arm x86 mips nobrillo
     vfork;
     vfprintf;
     vfscanf;
@@ -1163,7 +1141,6 @@
     vwprintf;
     vwscanf;
     wait;
-    wait3; # arm x86 mips nobrillo
     wait4;
     waitid;
     waitpid;
@@ -1212,7 +1189,6 @@
     wcstoull;
     wcstoull_l;
     wcstoumax;
-    wcswcs; # arm x86 mips nobrillo
     wcswidth;
     wcsxfrm;
     wcsxfrm_l;
@@ -1404,9 +1380,11 @@
     __page_size; # arm x86 mips nobrillo
     __popcount_tab; # arm
     __popcountsi2; # arm x86 mips
+    __pthread_gettid; # arm x86 mips nobrillo
     __restore_core_regs; # arm
     __sclose; # arm x86 mips
     __sdidinit; # arm x86 mips nobrillo
+    __set_errno; # arm x86 mips nobrillo
     __sflags; # arm x86 mips
     __sflush; # arm x86 mips
     __sfp; # arm x86 mips
@@ -1444,17 +1422,39 @@
     _Unwind_VRS_Get; # arm
     _Unwind_VRS_Pop; # arm
     _Unwind_VRS_Set; # arm
+    arc4random_addrandom; # arm x86 mips nobrillo
+    arc4random_stir; # arm x86 mips nobrillo
     atexit; # arm
+    bcopy; # arm x86 mips nobrillo
+    bsd_signal; # arm x86 mips nobrillo
     dlmalloc; # arm x86 mips nobrillo
     dlmalloc_inspect_all; # arm x86 mips nobrillo
     dlmalloc_trim; # arm x86 mips nobrillo
     dlmalloc_usable_size; # arm x86 mips nobrillo
+    endpwent; # arm x86 mips nobrillo
+    fdprintf; # arm x86 mips nobrillo
     free_malloc_leak_info;
+    ftime; # arm x86 mips nobrillo
     get_malloc_leak_info;
+    getdents; # arm x86 mips nobrillo
+    getdtablesize; # arm x86 mips nobrillo
     gMallocLeakZygoteChild;
+    index; # arm x86 mips nobrillo
+    issetugid; # arm x86 mips nobrillo
+    memswap; # arm x86 mips nobrillo
+    pthread_attr_getstackaddr; # arm x86 mips nobrillo
+    pthread_attr_setstackaddr; # arm x86 mips nobrillo
     restore_core_regs; # arm
     SHA1Final; # arm x86 mips
     SHA1Init; # arm x86 mips
     SHA1Transform; # arm x86 mips
     SHA1Update; # arm x86 mips
+    strntoimax; # arm x86 mips nobrillo
+    strntoumax; # arm x86 mips nobrillo
+    strtotimeval; # arm x86 mips nobrillo
+    sysv_signal; # arm x86 mips nobrillo
+    tkill; # arm x86 mips nobrillo
+    vfdprintf; # arm x86 mips nobrillo
+    wait3; # arm x86 mips nobrillo
+    wcswcs; # arm x86 mips nobrillo
 } LIBC_N;
diff --git a/libc/libc.arm64.map b/libc/libc.arm64.map
index c05afc0..530706d 100644
--- a/libc/libc.arm64.map
+++ b/libc/libc.arm64.map
@@ -131,21 +131,6 @@
     __sym_ntop;
     __sym_ntos;
     __sym_ston;
-    __system_properties_init;
-    __system_property_add;
-    __system_property_area__;
-    __system_property_area_init;
-    __system_property_area_serial;
-    __system_property_find;
-    __system_property_find_nth;
-    __system_property_foreach;
-    __system_property_get;
-    __system_property_read;
-    __system_property_serial;
-    __system_property_set;
-    __system_property_set_filename;
-    __system_property_update;
-    __system_property_wait_any;
     __umask_chk;
     __vsnprintf_chk;
     __vsprintf_chk;
@@ -1181,6 +1166,21 @@
 
 LIBC_PRIVATE {
   global:
+    __system_properties_init; # arm64 x86_64 mips64
+    __system_property_add; # arm64 x86_64 mips64
+    __system_property_area__; # arm64 x86_64 mips64
+    __system_property_area_init; # arm64 x86_64 mips64
+    __system_property_area_serial; # arm64 x86_64 mips64
+    __system_property_find; # arm64 x86_64 mips64
+    __system_property_find_nth; # arm64 x86_64 mips64
+    __system_property_foreach; # arm64 x86_64 mips64
+    __system_property_get; # arm64 x86_64 mips64
+    __system_property_read; # arm64 x86_64 mips64
+    __system_property_serial; # arm64 x86_64 mips64
+    __system_property_set; # arm64 x86_64 mips64
+    __system_property_set_filename; # arm64 x86_64 mips64
+    __system_property_update; # arm64 x86_64 mips64
+    __system_property_wait_any; # arm64 x86_64 mips64
     free_malloc_leak_info;
     get_malloc_leak_info;
     gMallocLeakZygoteChild;
diff --git a/libc/libc.map.txt b/libc/libc.map.txt
index a55c426..a91c4d7 100644
--- a/libc/libc.map.txt
+++ b/libc/libc.map.txt
@@ -123,7 +123,6 @@
     __pselect6; # arm x86 mips
     __pthread_cleanup_pop;
     __pthread_cleanup_push;
-    __pthread_gettid; # arm x86 mips nobrillo
     __ptrace; # arm x86 mips
     __putlong;
     __putshort;
@@ -162,7 +161,6 @@
     __sched_cpucount;
     __sched_cpufree;
     __sched_getaffinity; # arm x86 mips
-    __set_errno; # arm x86 mips nobrillo
     __set_thread_area; # x86
     __set_tid_address; # arm x86 mips
     __set_tls; # arm mips
@@ -191,21 +189,21 @@
     __sym_ntop;
     __sym_ntos;
     __sym_ston;
-    __system_properties_init;
-    __system_property_add;
-    __system_property_area__;
-    __system_property_area_init;
-    __system_property_area_serial;
-    __system_property_find;
-    __system_property_find_nth;
-    __system_property_foreach;
-    __system_property_get;
-    __system_property_read;
-    __system_property_serial;
-    __system_property_set;
-    __system_property_set_filename;
-    __system_property_update;
-    __system_property_wait_any;
+    __system_properties_init; # arm x86 mips
+    __system_property_add; # arm x86 mips
+    __system_property_area__; # arm x86 mips
+    __system_property_area_init; # arm x86 mips
+    __system_property_area_serial; # arm x86 mips
+    __system_property_find; # arm x86 mips
+    __system_property_find_nth; # arm x86 mips
+    __system_property_foreach; # arm x86 mips
+    __system_property_get; # arm x86 mips
+    __system_property_read; # arm x86 mips
+    __system_property_serial; # arm x86 mips
+    __system_property_set; # arm x86 mips
+    __system_property_set_filename; # arm x86 mips
+    __system_property_update; # arm x86 mips
+    __system_property_wait_any; # arm x86 mips
     __timer_create; # arm x86 mips
     __timer_delete; # arm x86 mips
     __timer_getoverrun; # arm x86 mips
@@ -246,9 +244,7 @@
     android_gethostbynamefornet;
     android_set_abort_message;
     arc4random;
-    arc4random_addrandom; # arm x86 mips nobrillo
     arc4random_buf;
-    arc4random_stir; # arm x86 mips nobrillo
     arc4random_uniform;
     asctime;
     asctime64; # arm x86 mips
@@ -262,11 +258,9 @@
     atoll;
     basename;
     basename_r; # arm x86 mips
-    bcopy; # arm x86 mips nobrillo
     bind;
     bindresvport;
     brk;
-    bsd_signal; # arm x86 mips nobrillo
     bsearch;
     btowc;
     bzero; # arm x86 mips
@@ -322,7 +316,6 @@
     dup3;
     duplocale;
     endmntent;
-    endpwent; # arm x86 mips nobrillo
     endservent;
     endutent;
     environ;
@@ -369,7 +362,6 @@
     fdatasync;
     fdopen;
     fdopendir;
-    fdprintf; # arm x86 mips nobrillo
     feof;
     feof_unlocked;
     ferror;
@@ -421,7 +413,6 @@
     fsync;
     ftell;
     ftello;
-    ftime; # arm x86 mips nobrillo
     ftok;
     ftruncate;
     ftruncate64;
@@ -453,8 +444,6 @@
     getchar_unlocked;
     getcwd;
     getdelim;
-    getdents; # arm x86 mips nobrillo
-    getdtablesize; # arm x86 mips nobrillo
     getegid;
     getenv;
     geteuid;
@@ -529,7 +518,6 @@
     if_nametoindex;
     imaxabs;
     imaxdiv;
-    index; # arm x86 mips nobrillo
     inet_addr;
     inet_aton;
     inet_lnaof;
@@ -582,7 +570,6 @@
     isprint_l;
     ispunct;
     ispunct_l;
-    issetugid; # arm x86 mips nobrillo
     isspace;
     isspace_l;
     isupper;
@@ -672,7 +659,6 @@
     mempcpy;
     memrchr;
     memset;
-    memswap; # arm x86 mips nobrillo
     mincore;
     mkdir;
     mkdirat;
@@ -786,7 +772,6 @@
     pthread_attr_getschedpolicy;
     pthread_attr_getscope;
     pthread_attr_getstack;
-    pthread_attr_getstackaddr; # arm x86 mips nobrillo
     pthread_attr_getstacksize;
     pthread_attr_init;
     pthread_attr_setdetachstate;
@@ -795,7 +780,6 @@
     pthread_attr_setschedpolicy;
     pthread_attr_setscope;
     pthread_attr_setstack;
-    pthread_attr_setstackaddr; # arm x86 mips nobrillo
     pthread_attr_setstacksize;
     pthread_cond_broadcast;
     pthread_cond_destroy;
@@ -1053,8 +1037,6 @@
     strncpy;
     strndup;
     strnlen;
-    strntoimax; # arm x86 mips nobrillo
-    strntoumax; # arm x86 mips nobrillo
     strpbrk;
     strptime;
     strrchr;
@@ -1073,7 +1055,6 @@
     strtoll;
     strtoll_l;
     strtoq;
-    strtotimeval; # arm x86 mips nobrillo
     strtoul;
     strtoull;
     strtoull_l;
@@ -1095,7 +1076,6 @@
     sysinfo;
     syslog;
     system;
-    sysv_signal; # arm x86 mips nobrillo
     tcdrain;
     tcflow;
     tcflush;
@@ -1127,7 +1107,6 @@
     timerfd_settime;
     times;
     timezone;
-    tkill; # arm x86 mips nobrillo
     tmpfile;
     tmpnam;
     toascii;
@@ -1169,7 +1148,6 @@
     vdprintf;
     verr;
     verrx;
-    vfdprintf; # arm x86 mips nobrillo
     vfork;
     vfprintf;
     vfscanf;
@@ -1189,7 +1167,6 @@
     vwprintf;
     vwscanf;
     wait;
-    wait3; # arm x86 mips nobrillo
     wait4;
     waitid;
     waitpid;
@@ -1238,7 +1215,6 @@
     wcstoull;
     wcstoull_l;
     wcstoumax;
-    wcswcs; # arm x86 mips nobrillo
     wcswidth;
     wcsxfrm;
     wcsxfrm_l;
@@ -1430,9 +1406,11 @@
     __page_size; # arm x86 mips nobrillo
     __popcount_tab; # arm
     __popcountsi2; # arm x86 mips
+    __pthread_gettid; # arm x86 mips nobrillo
     __restore_core_regs; # arm
     __sclose; # arm x86 mips
     __sdidinit; # arm x86 mips nobrillo
+    __set_errno; # arm x86 mips nobrillo
     __sflags; # arm x86 mips
     __sflush; # arm x86 mips
     __sfp; # arm x86 mips
@@ -1448,6 +1426,21 @@
     __swbuf; # arm x86 mips
     __swrite; # arm x86 mips
     __swsetup; # arm x86 mips
+    __system_properties_init; # arm64 x86_64 mips64
+    __system_property_add; # arm64 x86_64 mips64
+    __system_property_area__; # arm64 x86_64 mips64
+    __system_property_area_init; # arm64 x86_64 mips64
+    __system_property_area_serial; # arm64 x86_64 mips64
+    __system_property_find; # arm64 x86_64 mips64
+    __system_property_find_nth; # arm64 x86_64 mips64
+    __system_property_foreach; # arm64 x86_64 mips64
+    __system_property_get; # arm64 x86_64 mips64
+    __system_property_read; # arm64 x86_64 mips64
+    __system_property_serial; # arm64 x86_64 mips64
+    __system_property_set; # arm64 x86_64 mips64
+    __system_property_set_filename; # arm64 x86_64 mips64
+    __system_property_update; # arm64 x86_64 mips64
+    __system_property_wait_any; # arm64 x86_64 mips64
     __truncdfsf2; # arm
     __udivdi3; # arm x86 mips
     __udivsi3; # arm
@@ -1471,17 +1464,39 @@
     _Unwind_VRS_Get; # arm
     _Unwind_VRS_Pop; # arm
     _Unwind_VRS_Set; # arm
+    arc4random_addrandom; # arm x86 mips nobrillo
+    arc4random_stir; # arm x86 mips nobrillo
     atexit; # arm
+    bcopy; # arm x86 mips nobrillo
+    bsd_signal; # arm x86 mips nobrillo
     dlmalloc; # arm x86 mips nobrillo
     dlmalloc_inspect_all; # arm x86 mips nobrillo
     dlmalloc_trim; # arm x86 mips nobrillo
     dlmalloc_usable_size; # arm x86 mips nobrillo
+    endpwent; # arm x86 mips nobrillo
+    fdprintf; # arm x86 mips nobrillo
     free_malloc_leak_info;
+    ftime; # arm x86 mips nobrillo
     get_malloc_leak_info;
+    getdents; # arm x86 mips nobrillo
+    getdtablesize; # arm x86 mips nobrillo
     gMallocLeakZygoteChild;
+    index; # arm x86 mips nobrillo
+    issetugid; # arm x86 mips nobrillo
+    memswap; # arm x86 mips nobrillo
+    pthread_attr_getstackaddr; # arm x86 mips nobrillo
+    pthread_attr_setstackaddr; # arm x86 mips nobrillo
     restore_core_regs; # arm
     SHA1Final; # arm x86 mips
     SHA1Init; # arm x86 mips
     SHA1Transform; # arm x86 mips
     SHA1Update; # arm x86 mips
+    strntoimax; # arm x86 mips nobrillo
+    strntoumax; # arm x86 mips nobrillo
+    strtotimeval; # arm x86 mips nobrillo
+    sysv_signal; # arm x86 mips nobrillo
+    tkill; # arm x86 mips nobrillo
+    vfdprintf; # arm x86 mips nobrillo
+    wait3; # arm x86 mips nobrillo
+    wcswcs; # arm x86 mips nobrillo
 } LIBC_N;
diff --git a/libc/libc.mips.brillo.map b/libc/libc.mips.brillo.map
index 4d3aa4b..9a45181 100644
--- a/libc/libc.mips.brillo.map
+++ b/libc/libc.mips.brillo.map
@@ -185,21 +185,21 @@
     __sym_ntop;
     __sym_ntos;
     __sym_ston;
-    __system_properties_init;
-    __system_property_add;
-    __system_property_area__;
-    __system_property_area_init;
-    __system_property_area_serial;
-    __system_property_find;
-    __system_property_find_nth;
-    __system_property_foreach;
-    __system_property_get;
-    __system_property_read;
-    __system_property_serial;
-    __system_property_set;
-    __system_property_set_filename;
-    __system_property_update;
-    __system_property_wait_any;
+    __system_properties_init; # arm x86 mips
+    __system_property_add; # arm x86 mips
+    __system_property_area__; # arm x86 mips
+    __system_property_area_init; # arm x86 mips
+    __system_property_area_serial; # arm x86 mips
+    __system_property_find; # arm x86 mips
+    __system_property_find_nth; # arm x86 mips
+    __system_property_foreach; # arm x86 mips
+    __system_property_get; # arm x86 mips
+    __system_property_read; # arm x86 mips
+    __system_property_serial; # arm x86 mips
+    __system_property_set; # arm x86 mips
+    __system_property_set_filename; # arm x86 mips
+    __system_property_update; # arm x86 mips
+    __system_property_wait_any; # arm x86 mips
     __timer_create; # arm x86 mips
     __timer_delete; # arm x86 mips
     __timer_getoverrun; # arm x86 mips
diff --git a/libc/libc.mips.map b/libc/libc.mips.map
index 02e62cc..df0e4b7 100644
--- a/libc/libc.mips.map
+++ b/libc/libc.mips.map
@@ -120,7 +120,6 @@
     __pselect6; # arm x86 mips
     __pthread_cleanup_pop;
     __pthread_cleanup_push;
-    __pthread_gettid; # arm x86 mips nobrillo
     __ptrace; # arm x86 mips
     __putlong;
     __putshort;
@@ -159,7 +158,6 @@
     __sched_cpucount;
     __sched_cpufree;
     __sched_getaffinity; # arm x86 mips
-    __set_errno; # arm x86 mips nobrillo
     __set_tid_address; # arm x86 mips
     __set_tls; # arm mips
     __sF;
@@ -187,21 +185,21 @@
     __sym_ntop;
     __sym_ntos;
     __sym_ston;
-    __system_properties_init;
-    __system_property_add;
-    __system_property_area__;
-    __system_property_area_init;
-    __system_property_area_serial;
-    __system_property_find;
-    __system_property_find_nth;
-    __system_property_foreach;
-    __system_property_get;
-    __system_property_read;
-    __system_property_serial;
-    __system_property_set;
-    __system_property_set_filename;
-    __system_property_update;
-    __system_property_wait_any;
+    __system_properties_init; # arm x86 mips
+    __system_property_add; # arm x86 mips
+    __system_property_area__; # arm x86 mips
+    __system_property_area_init; # arm x86 mips
+    __system_property_area_serial; # arm x86 mips
+    __system_property_find; # arm x86 mips
+    __system_property_find_nth; # arm x86 mips
+    __system_property_foreach; # arm x86 mips
+    __system_property_get; # arm x86 mips
+    __system_property_read; # arm x86 mips
+    __system_property_serial; # arm x86 mips
+    __system_property_set; # arm x86 mips
+    __system_property_set_filename; # arm x86 mips
+    __system_property_update; # arm x86 mips
+    __system_property_wait_any; # arm x86 mips
     __timer_create; # arm x86 mips
     __timer_delete; # arm x86 mips
     __timer_getoverrun; # arm x86 mips
@@ -242,9 +240,7 @@
     android_gethostbynamefornet;
     android_set_abort_message;
     arc4random;
-    arc4random_addrandom; # arm x86 mips nobrillo
     arc4random_buf;
-    arc4random_stir; # arm x86 mips nobrillo
     arc4random_uniform;
     asctime;
     asctime64; # arm x86 mips
@@ -258,11 +254,9 @@
     atoll;
     basename;
     basename_r; # arm x86 mips
-    bcopy; # arm x86 mips nobrillo
     bind;
     bindresvport;
     brk;
-    bsd_signal; # arm x86 mips nobrillo
     bsearch;
     btowc;
     bzero; # arm x86 mips
@@ -318,7 +312,6 @@
     dup3;
     duplocale;
     endmntent;
-    endpwent; # arm x86 mips nobrillo
     endservent;
     endutent;
     environ;
@@ -365,7 +358,6 @@
     fdatasync;
     fdopen;
     fdopendir;
-    fdprintf; # arm x86 mips nobrillo
     feof;
     feof_unlocked;
     ferror;
@@ -417,7 +409,6 @@
     fsync;
     ftell;
     ftello;
-    ftime; # arm x86 mips nobrillo
     ftok;
     ftruncate;
     ftruncate64;
@@ -449,8 +440,6 @@
     getchar_unlocked;
     getcwd;
     getdelim;
-    getdents; # arm x86 mips nobrillo
-    getdtablesize; # arm x86 mips nobrillo
     getegid;
     getenv;
     geteuid;
@@ -525,7 +514,6 @@
     if_nametoindex;
     imaxabs;
     imaxdiv;
-    index; # arm x86 mips nobrillo
     inet_addr;
     inet_aton;
     inet_lnaof;
@@ -578,7 +566,6 @@
     isprint_l;
     ispunct;
     ispunct_l;
-    issetugid; # arm x86 mips nobrillo
     isspace;
     isspace_l;
     isupper;
@@ -668,7 +655,6 @@
     mempcpy;
     memrchr;
     memset;
-    memswap; # arm x86 mips nobrillo
     mincore;
     mkdir;
     mkdirat;
@@ -759,7 +745,6 @@
     pthread_attr_getschedpolicy;
     pthread_attr_getscope;
     pthread_attr_getstack;
-    pthread_attr_getstackaddr; # arm x86 mips nobrillo
     pthread_attr_getstacksize;
     pthread_attr_init;
     pthread_attr_setdetachstate;
@@ -768,7 +753,6 @@
     pthread_attr_setschedpolicy;
     pthread_attr_setscope;
     pthread_attr_setstack;
-    pthread_attr_setstackaddr; # arm x86 mips nobrillo
     pthread_attr_setstacksize;
     pthread_cond_broadcast;
     pthread_cond_destroy;
@@ -1026,8 +1010,6 @@
     strncpy;
     strndup;
     strnlen;
-    strntoimax; # arm x86 mips nobrillo
-    strntoumax; # arm x86 mips nobrillo
     strpbrk;
     strptime;
     strrchr;
@@ -1046,7 +1028,6 @@
     strtoll;
     strtoll_l;
     strtoq;
-    strtotimeval; # arm x86 mips nobrillo
     strtoul;
     strtoull;
     strtoull_l;
@@ -1068,7 +1049,6 @@
     sysinfo;
     syslog;
     system;
-    sysv_signal; # arm x86 mips nobrillo
     tcdrain;
     tcflow;
     tcflush;
@@ -1100,7 +1080,6 @@
     timerfd_settime;
     times;
     timezone;
-    tkill; # arm x86 mips nobrillo
     tmpfile;
     tmpnam;
     toascii;
@@ -1142,7 +1121,6 @@
     vdprintf;
     verr;
     verrx;
-    vfdprintf; # arm x86 mips nobrillo
     vfork;
     vfprintf;
     vfscanf;
@@ -1162,7 +1140,6 @@
     vwprintf;
     vwscanf;
     wait;
-    wait3; # arm x86 mips nobrillo
     wait4;
     waitid;
     waitpid;
@@ -1211,7 +1188,6 @@
     wcstoull;
     wcstoull_l;
     wcstoumax;
-    wcswcs; # arm x86 mips nobrillo
     wcswidth;
     wcsxfrm;
     wcsxfrm_l;
@@ -1283,8 +1259,10 @@
     __page_shift; # arm x86 mips nobrillo
     __page_size; # arm x86 mips nobrillo
     __popcountsi2; # arm x86 mips
+    __pthread_gettid; # arm x86 mips nobrillo
     __sclose; # arm x86 mips
     __sdidinit; # arm x86 mips nobrillo
+    __set_errno; # arm x86 mips nobrillo
     __sflags; # arm x86 mips
     __sflush; # arm x86 mips
     __sfp; # arm x86 mips
@@ -1302,15 +1280,37 @@
     __umoddi3; # x86 mips
     __wait4; # arm x86 mips nobrillo
     _fwalk; # arm x86 mips
+    arc4random_addrandom; # arm x86 mips nobrillo
+    arc4random_stir; # arm x86 mips nobrillo
+    bcopy; # arm x86 mips nobrillo
+    bsd_signal; # arm x86 mips nobrillo
     dlmalloc; # arm x86 mips nobrillo
     dlmalloc_inspect_all; # arm x86 mips nobrillo
     dlmalloc_trim; # arm x86 mips nobrillo
     dlmalloc_usable_size; # arm x86 mips nobrillo
+    endpwent; # arm x86 mips nobrillo
+    fdprintf; # arm x86 mips nobrillo
     free_malloc_leak_info;
+    ftime; # arm x86 mips nobrillo
     get_malloc_leak_info;
+    getdents; # arm x86 mips nobrillo
+    getdtablesize; # arm x86 mips nobrillo
     gMallocLeakZygoteChild;
+    index; # arm x86 mips nobrillo
+    issetugid; # arm x86 mips nobrillo
+    memswap; # arm x86 mips nobrillo
+    pthread_attr_getstackaddr; # arm x86 mips nobrillo
+    pthread_attr_setstackaddr; # arm x86 mips nobrillo
     SHA1Final; # arm x86 mips
     SHA1Init; # arm x86 mips
     SHA1Transform; # arm x86 mips
     SHA1Update; # arm x86 mips
+    strntoimax; # arm x86 mips nobrillo
+    strntoumax; # arm x86 mips nobrillo
+    strtotimeval; # arm x86 mips nobrillo
+    sysv_signal; # arm x86 mips nobrillo
+    tkill; # arm x86 mips nobrillo
+    vfdprintf; # arm x86 mips nobrillo
+    wait3; # arm x86 mips nobrillo
+    wcswcs; # arm x86 mips nobrillo
 } LIBC_N;
diff --git a/libc/libc.mips64.map b/libc/libc.mips64.map
index c05afc0..530706d 100644
--- a/libc/libc.mips64.map
+++ b/libc/libc.mips64.map
@@ -131,21 +131,6 @@
     __sym_ntop;
     __sym_ntos;
     __sym_ston;
-    __system_properties_init;
-    __system_property_add;
-    __system_property_area__;
-    __system_property_area_init;
-    __system_property_area_serial;
-    __system_property_find;
-    __system_property_find_nth;
-    __system_property_foreach;
-    __system_property_get;
-    __system_property_read;
-    __system_property_serial;
-    __system_property_set;
-    __system_property_set_filename;
-    __system_property_update;
-    __system_property_wait_any;
     __umask_chk;
     __vsnprintf_chk;
     __vsprintf_chk;
@@ -1181,6 +1166,21 @@
 
 LIBC_PRIVATE {
   global:
+    __system_properties_init; # arm64 x86_64 mips64
+    __system_property_add; # arm64 x86_64 mips64
+    __system_property_area__; # arm64 x86_64 mips64
+    __system_property_area_init; # arm64 x86_64 mips64
+    __system_property_area_serial; # arm64 x86_64 mips64
+    __system_property_find; # arm64 x86_64 mips64
+    __system_property_find_nth; # arm64 x86_64 mips64
+    __system_property_foreach; # arm64 x86_64 mips64
+    __system_property_get; # arm64 x86_64 mips64
+    __system_property_read; # arm64 x86_64 mips64
+    __system_property_serial; # arm64 x86_64 mips64
+    __system_property_set; # arm64 x86_64 mips64
+    __system_property_set_filename; # arm64 x86_64 mips64
+    __system_property_update; # arm64 x86_64 mips64
+    __system_property_wait_any; # arm64 x86_64 mips64
     free_malloc_leak_info;
     get_malloc_leak_info;
     gMallocLeakZygoteChild;
diff --git a/libc/libc.x86.brillo.map b/libc/libc.x86.brillo.map
index c7ee184..9c057c8 100644
--- a/libc/libc.x86.brillo.map
+++ b/libc/libc.x86.brillo.map
@@ -185,21 +185,21 @@
     __sym_ntop;
     __sym_ntos;
     __sym_ston;
-    __system_properties_init;
-    __system_property_add;
-    __system_property_area__;
-    __system_property_area_init;
-    __system_property_area_serial;
-    __system_property_find;
-    __system_property_find_nth;
-    __system_property_foreach;
-    __system_property_get;
-    __system_property_read;
-    __system_property_serial;
-    __system_property_set;
-    __system_property_set_filename;
-    __system_property_update;
-    __system_property_wait_any;
+    __system_properties_init; # arm x86 mips
+    __system_property_add; # arm x86 mips
+    __system_property_area__; # arm x86 mips
+    __system_property_area_init; # arm x86 mips
+    __system_property_area_serial; # arm x86 mips
+    __system_property_find; # arm x86 mips
+    __system_property_find_nth; # arm x86 mips
+    __system_property_foreach; # arm x86 mips
+    __system_property_get; # arm x86 mips
+    __system_property_read; # arm x86 mips
+    __system_property_serial; # arm x86 mips
+    __system_property_set; # arm x86 mips
+    __system_property_set_filename; # arm x86 mips
+    __system_property_update; # arm x86 mips
+    __system_property_wait_any; # arm x86 mips
     __timer_create; # arm x86 mips
     __timer_delete; # arm x86 mips
     __timer_getoverrun; # arm x86 mips
diff --git a/libc/libc.x86.map b/libc/libc.x86.map
index 34b138d..5e8fcb1 100644
--- a/libc/libc.x86.map
+++ b/libc/libc.x86.map
@@ -120,7 +120,6 @@
     __pselect6; # arm x86 mips
     __pthread_cleanup_pop;
     __pthread_cleanup_push;
-    __pthread_gettid; # arm x86 mips nobrillo
     __ptrace; # arm x86 mips
     __putlong;
     __putshort;
@@ -159,7 +158,6 @@
     __sched_cpucount;
     __sched_cpufree;
     __sched_getaffinity; # arm x86 mips
-    __set_errno; # arm x86 mips nobrillo
     __set_thread_area; # x86
     __set_tid_address; # arm x86 mips
     __sF;
@@ -187,21 +185,21 @@
     __sym_ntop;
     __sym_ntos;
     __sym_ston;
-    __system_properties_init;
-    __system_property_add;
-    __system_property_area__;
-    __system_property_area_init;
-    __system_property_area_serial;
-    __system_property_find;
-    __system_property_find_nth;
-    __system_property_foreach;
-    __system_property_get;
-    __system_property_read;
-    __system_property_serial;
-    __system_property_set;
-    __system_property_set_filename;
-    __system_property_update;
-    __system_property_wait_any;
+    __system_properties_init; # arm x86 mips
+    __system_property_add; # arm x86 mips
+    __system_property_area__; # arm x86 mips
+    __system_property_area_init; # arm x86 mips
+    __system_property_area_serial; # arm x86 mips
+    __system_property_find; # arm x86 mips
+    __system_property_find_nth; # arm x86 mips
+    __system_property_foreach; # arm x86 mips
+    __system_property_get; # arm x86 mips
+    __system_property_read; # arm x86 mips
+    __system_property_serial; # arm x86 mips
+    __system_property_set; # arm x86 mips
+    __system_property_set_filename; # arm x86 mips
+    __system_property_update; # arm x86 mips
+    __system_property_wait_any; # arm x86 mips
     __timer_create; # arm x86 mips
     __timer_delete; # arm x86 mips
     __timer_getoverrun; # arm x86 mips
@@ -241,9 +239,7 @@
     android_gethostbynamefornet;
     android_set_abort_message;
     arc4random;
-    arc4random_addrandom; # arm x86 mips nobrillo
     arc4random_buf;
-    arc4random_stir; # arm x86 mips nobrillo
     arc4random_uniform;
     asctime;
     asctime64; # arm x86 mips
@@ -257,11 +253,9 @@
     atoll;
     basename;
     basename_r; # arm x86 mips
-    bcopy; # arm x86 mips nobrillo
     bind;
     bindresvport;
     brk;
-    bsd_signal; # arm x86 mips nobrillo
     bsearch;
     btowc;
     bzero; # arm x86 mips
@@ -316,7 +310,6 @@
     dup3;
     duplocale;
     endmntent;
-    endpwent; # arm x86 mips nobrillo
     endservent;
     endutent;
     environ;
@@ -363,7 +356,6 @@
     fdatasync;
     fdopen;
     fdopendir;
-    fdprintf; # arm x86 mips nobrillo
     feof;
     feof_unlocked;
     ferror;
@@ -415,7 +407,6 @@
     fsync;
     ftell;
     ftello;
-    ftime; # arm x86 mips nobrillo
     ftok;
     ftruncate;
     ftruncate64;
@@ -447,8 +438,6 @@
     getchar_unlocked;
     getcwd;
     getdelim;
-    getdents; # arm x86 mips nobrillo
-    getdtablesize; # arm x86 mips nobrillo
     getegid;
     getenv;
     geteuid;
@@ -523,7 +512,6 @@
     if_nametoindex;
     imaxabs;
     imaxdiv;
-    index; # arm x86 mips nobrillo
     inet_addr;
     inet_aton;
     inet_lnaof;
@@ -576,7 +564,6 @@
     isprint_l;
     ispunct;
     ispunct_l;
-    issetugid; # arm x86 mips nobrillo
     isspace;
     isspace_l;
     isupper;
@@ -666,7 +653,6 @@
     mempcpy;
     memrchr;
     memset;
-    memswap; # arm x86 mips nobrillo
     mincore;
     mkdir;
     mkdirat;
@@ -757,7 +743,6 @@
     pthread_attr_getschedpolicy;
     pthread_attr_getscope;
     pthread_attr_getstack;
-    pthread_attr_getstackaddr; # arm x86 mips nobrillo
     pthread_attr_getstacksize;
     pthread_attr_init;
     pthread_attr_setdetachstate;
@@ -766,7 +751,6 @@
     pthread_attr_setschedpolicy;
     pthread_attr_setscope;
     pthread_attr_setstack;
-    pthread_attr_setstackaddr; # arm x86 mips nobrillo
     pthread_attr_setstacksize;
     pthread_cond_broadcast;
     pthread_cond_destroy;
@@ -1024,8 +1008,6 @@
     strncpy;
     strndup;
     strnlen;
-    strntoimax; # arm x86 mips nobrillo
-    strntoumax; # arm x86 mips nobrillo
     strpbrk;
     strptime;
     strrchr;
@@ -1044,7 +1026,6 @@
     strtoll;
     strtoll_l;
     strtoq;
-    strtotimeval; # arm x86 mips nobrillo
     strtoul;
     strtoull;
     strtoull_l;
@@ -1066,7 +1047,6 @@
     sysinfo;
     syslog;
     system;
-    sysv_signal; # arm x86 mips nobrillo
     tcdrain;
     tcflow;
     tcflush;
@@ -1098,7 +1078,6 @@
     timerfd_settime;
     times;
     timezone;
-    tkill; # arm x86 mips nobrillo
     tmpfile;
     tmpnam;
     toascii;
@@ -1140,7 +1119,6 @@
     vdprintf;
     verr;
     verrx;
-    vfdprintf; # arm x86 mips nobrillo
     vfork;
     vfprintf;
     vfscanf;
@@ -1160,7 +1138,6 @@
     vwprintf;
     vwscanf;
     wait;
-    wait3; # arm x86 mips nobrillo
     wait4;
     waitid;
     waitpid;
@@ -1209,7 +1186,6 @@
     wcstoull;
     wcstoull_l;
     wcstoumax;
-    wcswcs; # arm x86 mips nobrillo
     wcswidth;
     wcsxfrm;
     wcsxfrm_l;
@@ -1282,8 +1258,10 @@
     __page_shift; # arm x86 mips nobrillo
     __page_size; # arm x86 mips nobrillo
     __popcountsi2; # arm x86 mips
+    __pthread_gettid; # arm x86 mips nobrillo
     __sclose; # arm x86 mips
     __sdidinit; # arm x86 mips nobrillo
+    __set_errno; # arm x86 mips nobrillo
     __sflags; # arm x86 mips
     __sflush; # arm x86 mips
     __sfp; # arm x86 mips
@@ -1301,15 +1279,37 @@
     __umoddi3; # x86 mips
     __wait4; # arm x86 mips nobrillo
     _fwalk; # arm x86 mips
+    arc4random_addrandom; # arm x86 mips nobrillo
+    arc4random_stir; # arm x86 mips nobrillo
+    bcopy; # arm x86 mips nobrillo
+    bsd_signal; # arm x86 mips nobrillo
     dlmalloc; # arm x86 mips nobrillo
     dlmalloc_inspect_all; # arm x86 mips nobrillo
     dlmalloc_trim; # arm x86 mips nobrillo
     dlmalloc_usable_size; # arm x86 mips nobrillo
+    endpwent; # arm x86 mips nobrillo
+    fdprintf; # arm x86 mips nobrillo
     free_malloc_leak_info;
+    ftime; # arm x86 mips nobrillo
     get_malloc_leak_info;
+    getdents; # arm x86 mips nobrillo
+    getdtablesize; # arm x86 mips nobrillo
     gMallocLeakZygoteChild;
+    index; # arm x86 mips nobrillo
+    issetugid; # arm x86 mips nobrillo
+    memswap; # arm x86 mips nobrillo
+    pthread_attr_getstackaddr; # arm x86 mips nobrillo
+    pthread_attr_setstackaddr; # arm x86 mips nobrillo
     SHA1Final; # arm x86 mips
     SHA1Init; # arm x86 mips
     SHA1Transform; # arm x86 mips
     SHA1Update; # arm x86 mips
+    strntoimax; # arm x86 mips nobrillo
+    strntoumax; # arm x86 mips nobrillo
+    strtotimeval; # arm x86 mips nobrillo
+    sysv_signal; # arm x86 mips nobrillo
+    tkill; # arm x86 mips nobrillo
+    vfdprintf; # arm x86 mips nobrillo
+    wait3; # arm x86 mips nobrillo
+    wcswcs; # arm x86 mips nobrillo
 } LIBC_N;
diff --git a/libc/libc.x86_64.map b/libc/libc.x86_64.map
index c05afc0..530706d 100644
--- a/libc/libc.x86_64.map
+++ b/libc/libc.x86_64.map
@@ -131,21 +131,6 @@
     __sym_ntop;
     __sym_ntos;
     __sym_ston;
-    __system_properties_init;
-    __system_property_add;
-    __system_property_area__;
-    __system_property_area_init;
-    __system_property_area_serial;
-    __system_property_find;
-    __system_property_find_nth;
-    __system_property_foreach;
-    __system_property_get;
-    __system_property_read;
-    __system_property_serial;
-    __system_property_set;
-    __system_property_set_filename;
-    __system_property_update;
-    __system_property_wait_any;
     __umask_chk;
     __vsnprintf_chk;
     __vsprintf_chk;
@@ -1181,6 +1166,21 @@
 
 LIBC_PRIVATE {
   global:
+    __system_properties_init; # arm64 x86_64 mips64
+    __system_property_add; # arm64 x86_64 mips64
+    __system_property_area__; # arm64 x86_64 mips64
+    __system_property_area_init; # arm64 x86_64 mips64
+    __system_property_area_serial; # arm64 x86_64 mips64
+    __system_property_find; # arm64 x86_64 mips64
+    __system_property_find_nth; # arm64 x86_64 mips64
+    __system_property_foreach; # arm64 x86_64 mips64
+    __system_property_get; # arm64 x86_64 mips64
+    __system_property_read; # arm64 x86_64 mips64
+    __system_property_serial; # arm64 x86_64 mips64
+    __system_property_set; # arm64 x86_64 mips64
+    __system_property_set_filename; # arm64 x86_64 mips64
+    __system_property_update; # arm64 x86_64 mips64
+    __system_property_wait_any; # arm64 x86_64 mips64
     free_malloc_leak_info;
     get_malloc_leak_info;
     gMallocLeakZygoteChild;