Revert "Move __system_property* to LIBC_PRIVATE for lp64 libc"

This reverts commit ff14fb5a1f809d87125fa0d14f08d486b6bf1ea1.

Bug: http://b/26497521
Change-Id: Id7131b37a31e936db0e72ef9969e1f13d2dd578f
diff --git a/libc/libc.arm.brillo.map b/libc/libc.arm.brillo.map
index 85ded30..8cbff2b 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; # 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
+    __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;
     __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 8a9575e..bb42c0f 100644
--- a/libc/libc.arm.map
+++ b/libc/libc.arm.map
@@ -187,21 +187,21 @@
     __sym_ntop;
     __sym_ntos;
     __sym_ston;
-    __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
+    __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;
     __timer_create; # arm x86 mips
     __timer_delete; # arm x86 mips
     __timer_getoverrun; # arm x86 mips
diff --git a/libc/libc.arm64.map b/libc/libc.arm64.map
index 7dee1c5..e54bef6 100644
--- a/libc/libc.arm64.map
+++ b/libc/libc.arm64.map
@@ -131,6 +131,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;
     __umask_chk;
     __vsnprintf_chk;
     __vsprintf_chk;
@@ -1164,21 +1179,6 @@
 
 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 91d10d4..c80c19f 100644
--- a/libc/libc.map.txt
+++ b/libc/libc.map.txt
@@ -189,21 +189,21 @@
     __sym_ntop;
     __sym_ntos;
     __sym_ston;
-    __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
+    __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;
     __timer_create; # arm x86 mips
     __timer_delete; # arm x86 mips
     __timer_getoverrun; # arm x86 mips
@@ -1424,21 +1424,6 @@
     __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
diff --git a/libc/libc.mips.brillo.map b/libc/libc.mips.brillo.map
index c4c5839..709ffd9 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; # 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
+    __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;
     __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 5774068..cb068ef 100644
--- a/libc/libc.mips.map
+++ b/libc/libc.mips.map
@@ -185,21 +185,21 @@
     __sym_ntop;
     __sym_ntos;
     __sym_ston;
-    __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
+    __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;
     __timer_create; # arm x86 mips
     __timer_delete; # arm x86 mips
     __timer_getoverrun; # arm x86 mips
diff --git a/libc/libc.mips64.map b/libc/libc.mips64.map
index 7dee1c5..e54bef6 100644
--- a/libc/libc.mips64.map
+++ b/libc/libc.mips64.map
@@ -131,6 +131,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;
     __umask_chk;
     __vsnprintf_chk;
     __vsprintf_chk;
@@ -1164,21 +1179,6 @@
 
 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 4ac7fe7..82df4a4 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; # 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
+    __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;
     __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 e1fa4da..94e4b80 100644
--- a/libc/libc.x86.map
+++ b/libc/libc.x86.map
@@ -185,21 +185,21 @@
     __sym_ntop;
     __sym_ntos;
     __sym_ston;
-    __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
+    __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;
     __timer_create; # arm x86 mips
     __timer_delete; # arm x86 mips
     __timer_getoverrun; # arm x86 mips
diff --git a/libc/libc.x86_64.map b/libc/libc.x86_64.map
index 7dee1c5..e54bef6 100644
--- a/libc/libc.x86_64.map
+++ b/libc/libc.x86_64.map
@@ -131,6 +131,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;
     __umask_chk;
     __vsnprintf_chk;
     __vsprintf_chk;
@@ -1164,21 +1179,6 @@
 
 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;