Revert "Stop using socketcall(2) for socket() on x86."

This reverts commit 76ed63a3b2350eac711b8ac1eb3652397de5f6c1.

Reason for revert: DroidMonitor: Potential culprit for http://b/479860702 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Fix: 479860702
Change-Id: If3bc18cfe6187ffb6a8bf59bcef1448cabc5f286

libc/SYSCALLS.TXT

diff --git a/libc/SYSCALLS.TXT b/libc/SYSCALLS.TXT
index 1f83218..3622ca4 100644
--- a/libc/SYSCALLS.TXT
+++ b/libc/SYSCALLS.TXT
@@ -262,7 +262,7 @@
 __signalfd4:signalfd4(int, const sigset64_t*, size_t, int)  all
 
 # sockets
-__socket:socket(int, int, int)  all
+__socket:socket(int, int, int)              arm,lp64
 __socketpair:socketpair(int, int, int, int*)    arm,lp64
 bind(int, struct sockaddr*, socklen_t)  all
 __connect:connect(int, struct sockaddr*, socklen_t)   arm,lp64
@@ -288,6 +288,7 @@
 # See http://b/423197304 for more background, and http://b/435724036 for advice
 # on how to test WebView changes if you do decide to try to remove these before
 # we just drop 32-bit entirely.
+__socket:socketcall:1(int, int, int) x86
 __connect:socketcall:3(int, struct sockaddr*, socklen_t)   x86
 __socketpair:socketcall:8(int, int, int, int*)    x86
 __sendto:socketcall:11(int, const void*, size_t, int, const struct sockaddr*, socklen_t)  x86