Move __system_property_*_serial back to LIBC

Bug: http://b/35764972
Bug: http://b/34114501
Test: make
Change-Id: Ibbda0107d07c432110a0633de03259e39480fde4
diff --git a/libc/libc.arm.map b/libc/libc.arm.map
index 798b9c3..9ad26ff 100644
--- a/libc/libc.arm.map
+++ b/libc/libc.arm.map
@@ -185,10 +185,12 @@
     __sym_ntop;
     __sym_ntos;
     __sym_ston;
+    __system_property_area_serial; # introduced=23
     __system_property_find;
     __system_property_foreach; # introduced-arm=19 introduced-arm64=21 introduced-mips=19 introduced-mips64=21 introduced-x86=19 introduced-x86_64=21
     __system_property_get;
     __system_property_read;
+    __system_property_serial; # introduced-arm=19 introduced-arm64=21 introduced-mips=19 introduced-mips64=21 introduced-x86=19 introduced-x86_64=21
     __system_property_set; # introduced-arm=12 introduced-arm64=21 introduced-mips=12 introduced-mips64=21 introduced-x86=12 introduced-x86_64=21
     __timer_create; # arm x86 mips
     __timer_delete; # arm x86 mips
@@ -1540,8 +1542,6 @@
     __system_property_area__; # var
     __system_property_add;
     __system_property_area_init;
-    __system_property_area_serial;
-    __system_property_serial;
     __system_property_set_filename;
     __system_property_update;
     android_net_res_stats_get_info_for_net;
diff --git a/libc/libc.arm64.map b/libc/libc.arm64.map
index c686bb9..4953380 100644
--- a/libc/libc.arm64.map
+++ b/libc/libc.arm64.map
@@ -130,10 +130,12 @@
     __sym_ntop;
     __sym_ntos;
     __sym_ston;
+    __system_property_area_serial; # introduced=23
     __system_property_find;
     __system_property_foreach; # introduced-arm=19 introduced-arm64=21 introduced-mips=19 introduced-mips64=21 introduced-x86=19 introduced-x86_64=21
     __system_property_get;
     __system_property_read;
+    __system_property_serial; # introduced-arm=19 introduced-arm64=21 introduced-mips=19 introduced-mips64=21 introduced-x86=19 introduced-x86_64=21
     __system_property_set; # introduced-arm=12 introduced-arm64=21 introduced-mips=12 introduced-mips64=21 introduced-x86=12 introduced-x86_64=21
     __umask_chk; # introduced-arm=18 introduced-arm64=21 introduced-mips=18 introduced-mips64=21 introduced-x86=18 introduced-x86_64=21
     __vsnprintf_chk; # introduced-arm=17 introduced-arm64=21 introduced-mips=17 introduced-mips64=21 introduced-x86=17 introduced-x86_64=21
@@ -1257,8 +1259,6 @@
     __system_property_area__; # var
     __system_property_add;
     __system_property_area_init;
-    __system_property_area_serial;
-    __system_property_serial;
     __system_property_set_filename;
     __system_property_update;
     android_net_res_stats_get_info_for_net;
diff --git a/libc/libc.map.txt b/libc/libc.map.txt
index 1217bd5..6cc0f32 100644
--- a/libc/libc.map.txt
+++ b/libc/libc.map.txt
@@ -186,10 +186,12 @@
     __sym_ntop;
     __sym_ntos;
     __sym_ston;
+    __system_property_area_serial; # introduced=23
     __system_property_find;
     __system_property_foreach; # introduced-arm=19 introduced-arm64=21 introduced-mips=19 introduced-mips64=21 introduced-x86=19 introduced-x86_64=21
     __system_property_get;
     __system_property_read;
+    __system_property_serial; # introduced-arm=19 introduced-arm64=21 introduced-mips=19 introduced-mips64=21 introduced-x86=19 introduced-x86_64=21
     __system_property_set; # introduced-arm=12 introduced-arm64=21 introduced-mips=12 introduced-mips64=21 introduced-x86=12 introduced-x86_64=21
     __timer_create; # arm x86 mips
     __timer_delete; # arm x86 mips
@@ -1566,8 +1568,6 @@
     __system_property_area__; # var
     __system_property_add;
     __system_property_area_init;
-    __system_property_area_serial;
-    __system_property_serial;
     __system_property_set_filename;
     __system_property_update;
     android_net_res_stats_get_info_for_net;
diff --git a/libc/libc.mips.map b/libc/libc.mips.map
index 79fbc1a..91d80e0 100644
--- a/libc/libc.mips.map
+++ b/libc/libc.mips.map
@@ -182,10 +182,12 @@
     __sym_ntop;
     __sym_ntos;
     __sym_ston;
+    __system_property_area_serial; # introduced=23
     __system_property_find;
     __system_property_foreach; # introduced-arm=19 introduced-arm64=21 introduced-mips=19 introduced-mips64=21 introduced-x86=19 introduced-x86_64=21
     __system_property_get;
     __system_property_read;
+    __system_property_serial; # introduced-arm=19 introduced-arm64=21 introduced-mips=19 introduced-mips64=21 introduced-x86=19 introduced-x86_64=21
     __system_property_set; # introduced-arm=12 introduced-arm64=21 introduced-mips=12 introduced-mips64=21 introduced-x86=12 introduced-x86_64=21
     __timer_create; # arm x86 mips
     __timer_delete; # arm x86 mips
@@ -1381,8 +1383,6 @@
     __system_property_area__; # var
     __system_property_add;
     __system_property_area_init;
-    __system_property_area_serial;
-    __system_property_serial;
     __system_property_set_filename;
     __system_property_update;
     android_net_res_stats_get_info_for_net;
diff --git a/libc/libc.mips64.map b/libc/libc.mips64.map
index c686bb9..4953380 100644
--- a/libc/libc.mips64.map
+++ b/libc/libc.mips64.map
@@ -130,10 +130,12 @@
     __sym_ntop;
     __sym_ntos;
     __sym_ston;
+    __system_property_area_serial; # introduced=23
     __system_property_find;
     __system_property_foreach; # introduced-arm=19 introduced-arm64=21 introduced-mips=19 introduced-mips64=21 introduced-x86=19 introduced-x86_64=21
     __system_property_get;
     __system_property_read;
+    __system_property_serial; # introduced-arm=19 introduced-arm64=21 introduced-mips=19 introduced-mips64=21 introduced-x86=19 introduced-x86_64=21
     __system_property_set; # introduced-arm=12 introduced-arm64=21 introduced-mips=12 introduced-mips64=21 introduced-x86=12 introduced-x86_64=21
     __umask_chk; # introduced-arm=18 introduced-arm64=21 introduced-mips=18 introduced-mips64=21 introduced-x86=18 introduced-x86_64=21
     __vsnprintf_chk; # introduced-arm=17 introduced-arm64=21 introduced-mips=17 introduced-mips64=21 introduced-x86=17 introduced-x86_64=21
@@ -1257,8 +1259,6 @@
     __system_property_area__; # var
     __system_property_add;
     __system_property_area_init;
-    __system_property_area_serial;
-    __system_property_serial;
     __system_property_set_filename;
     __system_property_update;
     android_net_res_stats_get_info_for_net;
diff --git a/libc/libc.x86.map b/libc/libc.x86.map
index a968693..7a72fca 100644
--- a/libc/libc.x86.map
+++ b/libc/libc.x86.map
@@ -182,10 +182,12 @@
     __sym_ntop;
     __sym_ntos;
     __sym_ston;
+    __system_property_area_serial; # introduced=23
     __system_property_find;
     __system_property_foreach; # introduced-arm=19 introduced-arm64=21 introduced-mips=19 introduced-mips64=21 introduced-x86=19 introduced-x86_64=21
     __system_property_get;
     __system_property_read;
+    __system_property_serial; # introduced-arm=19 introduced-arm64=21 introduced-mips=19 introduced-mips64=21 introduced-x86=19 introduced-x86_64=21
     __system_property_set; # introduced-arm=12 introduced-arm64=21 introduced-mips=12 introduced-mips64=21 introduced-x86=12 introduced-x86_64=21
     __timer_create; # arm x86 mips
     __timer_delete; # arm x86 mips
@@ -1380,8 +1382,6 @@
     __system_property_area__; # var
     __system_property_add;
     __system_property_area_init;
-    __system_property_area_serial;
-    __system_property_serial;
     __system_property_set_filename;
     __system_property_update;
     android_net_res_stats_get_info_for_net;
diff --git a/libc/libc.x86_64.map b/libc/libc.x86_64.map
index c686bb9..4953380 100644
--- a/libc/libc.x86_64.map
+++ b/libc/libc.x86_64.map
@@ -130,10 +130,12 @@
     __sym_ntop;
     __sym_ntos;
     __sym_ston;
+    __system_property_area_serial; # introduced=23
     __system_property_find;
     __system_property_foreach; # introduced-arm=19 introduced-arm64=21 introduced-mips=19 introduced-mips64=21 introduced-x86=19 introduced-x86_64=21
     __system_property_get;
     __system_property_read;
+    __system_property_serial; # introduced-arm=19 introduced-arm64=21 introduced-mips=19 introduced-mips64=21 introduced-x86=19 introduced-x86_64=21
     __system_property_set; # introduced-arm=12 introduced-arm64=21 introduced-mips=12 introduced-mips64=21 introduced-x86=12 introduced-x86_64=21
     __umask_chk; # introduced-arm=18 introduced-arm64=21 introduced-mips=18 introduced-mips64=21 introduced-x86=18 introduced-x86_64=21
     __vsnprintf_chk; # introduced-arm=17 introduced-arm64=21 introduced-mips=17 introduced-mips64=21 introduced-x86=17 introduced-x86_64=21
@@ -1257,8 +1259,6 @@
     __system_property_area__; # var
     __system_property_add;
     __system_property_area_init;
-    __system_property_area_serial;
-    __system_property_serial;
     __system_property_set_filename;
     __system_property_update;
     android_net_res_stats_get_info_for_net;