Snap for 8564071 from 9c9e93eccae01a93d1e8793d445366530e31dfa4 to mainline-conscrypt-release

Change-Id: Ibd449632a7195afc55fd279d6d9c00aae98000aa
diff --git a/OWNERS b/OWNERS
index bd5625e..039b84c 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,9 +1 @@
-set noparent
-
-# Android owners
-senj@google.com
-
-# Chromium owners
-vapier@google.com
-ejcaruso@google.com
-hidehiko@google.com
+include platform/system/update_engine:/OWNERS
diff --git a/brillo/streams/file_stream.h b/brillo/streams/file_stream.h
index bf54617..e2e29dd 100644
--- a/brillo/streams/file_stream.h
+++ b/brillo/streams/file_stream.h
@@ -5,6 +5,8 @@
 #ifndef LIBBRILLO_BRILLO_STREAMS_FILE_STREAM_H_
 #define LIBBRILLO_BRILLO_STREAMS_FILE_STREAM_H_
 
+#include <sys/types.h>
+
 #include <memory>
 
 #include <base/files/file_path.h>