Merge "Revert "Temporary move __udivdi3 back to LIBC for x86""

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

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

diff --cc libc/libc.map.txt
index ed20efc,d2e2b1b..f51c5d3
--- 1/libc/libc.map.txt
--- 2/libc/libc.map.txt
+++ b/libc/libc.map.txt
@@@ -1470,8 -1439,23 +1469,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 mips
+     __udivdi3; # arm x86 mips
      __udivsi3; # arm
      __umoddi3; # x86 mips
      __unorddf2; # arm

diff --cc libc/libc.mips.brillo.map
index d96de34,f268509..953fc29
--- 1/libc/libc.mips.brillo.map
--- 2/libc/libc.mips.brillo.map
+++ b/libc/libc.mips.brillo.map
@@@ -1294,13 -1264,9 +1294,13 @@@ LIBC_PRIVATE 
      __swbuf; # arm x86 mips
      __swrite; # arm x86 mips
      __swsetup; # arm x86 mips
-     __udivdi3; # arm mips
+     __udivdi3; # arm x86 mips
      __umoddi3; # x86 mips
      _fwalk; # arm x86 mips
 +    android_getaddrinfofornet;
 +    android_getaddrinfofornetcontext;
 +    android_gethostbyaddrfornet;
 +    android_gethostbynamefornet;
      free_malloc_leak_info;
      get_malloc_leak_info;
      gMallocLeakZygoteChild;

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

diff --cc libc/libc.x86.brillo.map
index f167183,333b419..9f6cc52
--- 1/libc/libc.x86.brillo.map
--- 2/libc/libc.x86.brillo.map
+++ b/libc/libc.x86.brillo.map
@@@ -1294,12 -1263,9 +1293,13 @@@ LIBC_PRIVATE 
      __swbuf; # arm x86 mips
      __swrite; # arm x86 mips
      __swsetup; # arm x86 mips
+     __udivdi3; # arm x86 mips
      __umoddi3; # x86 mips
      _fwalk; # arm x86 mips
 +    android_getaddrinfofornet;
 +    android_getaddrinfofornetcontext;
 +    android_gethostbyaddrfornet;
 +    android_gethostbynamefornet;
      free_malloc_leak_info;
      get_malloc_leak_info;
      gMallocLeakZygoteChild;

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