Merge "Use local copy of vm_sockets.h on non-Trusty for portability" into main

Author: Treehugger Robot

libs/binder/libbinder_rpc_unstable.cpp

@@ -23,11 +23,8 @@
 
 #ifndef __TRUSTY__
 #include <cutils/sockets.h>
-#endif
-
-#ifdef __linux__
-#include <linux/vm_sockets.h>
-#endif // __linux__
+#include "vm_sockets.h"
+#endif  // !__TRUSTY__
 
 using android::OK;
 using android::RpcServer;