Merge "Revert "Move __system_property* to LIBC_PRIVATE for lp64 libc""

diff --cc libc/libc.arm.brillo.map
Simple merge

diff --cc libc/libc.arm.map
Simple merge

diff --cc libc/libc.arm64.map
Simple merge

diff --cc libc/libc.map.txt
index 8306463,c80c19f..258ff48
--- 1/libc/libc.map.txt
--- 2/libc/libc.map.txt
+++ b/libc/libc.map.txt
@@@ -1440,23 -1424,8 +1440,8 @@@ LIBC_PRIVATE 
      __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
 +    __udivdi3; # arm mips
      __udivsi3; # arm
      __umoddi3; # x86 mips
      __unorddf2; # arm

diff --cc libc/libc.mips.brillo.map
Simple merge

diff --cc libc/libc.mips.map
Simple merge

diff --cc libc/libc.mips64.map
Simple merge

diff --cc libc/libc.x86.brillo.map
Simple merge

diff --cc libc/libc.x86.map
Simple merge

diff --cc libc/libc.x86_64.map
Simple merge