Snap for 8146528 from a5d8524764012eec093f12f53f4e36886dd5b1c5 to tm-release
Change-Id: I1d6f97dc2cb5a14b6d31e509ae23df67a99be58a
diff --git a/OWNERS b/OWNERS
index 9512b05..3414a74 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,3 +1 @@
-# Default code reviewers picked from top 3 or more developers.
-# Please update this list if you find better candidates.
-allight@google.com
+include platform/art:/OWNERS
diff --git a/src/solaris/javavm/export/jvm_md.h b/src/solaris/javavm/export/jvm_md.h
index 5c68191..62415ee 100644
--- a/src/solaris/javavm/export/jvm_md.h
+++ b/src/solaris/javavm/export/jvm_md.h
@@ -65,7 +65,7 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <errno.h>
-#include <sys/signal.h>
+#include <signal.h>
/* O Flags */
diff --git a/src/solaris/transport/socket/socket_md.c b/src/solaris/transport/socket/socket_md.c
index 33e062e..819fcab 100644
--- a/src/solaris/transport/socket/socket_md.c
+++ b/src/solaris/transport/socket/socket_md.c
@@ -37,7 +37,7 @@
#include <thread.h>
#else
#include <pthread.h>
-#include <sys/poll.h>
+#include <poll.h>
#endif
#include "socket_md.h"