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

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3409621

Change-Id: Id649fea8f7b458a377013b8dcb81aab272ea9a98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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;