Snap for 10453563 from 569980a32405b9d8f6bb8c0aea73b5ab256645de to mainline-art-release

Change-Id: Ibca941c8cf4e04bc82144a14b10d9ab2b1acb73d
diff --git a/PRESUBMIT.cfg b/PRESUBMIT.cfg
index 9993474..e037261 100644
--- a/PRESUBMIT.cfg
+++ b/PRESUBMIT.cfg
@@ -1,6 +1,5 @@
 [Hook Scripts]
-hook0=../../../../chromite/bin/cros lint ${PRESUBMIT_FILES}
-hook1=../../../platform2/common-mk/gnlint.py ${PRESUBMIT_FILES}
+cros lint = cros lint --commit ${PRESUBMIT_COMMIT} ${PRESUBMIT_FILES}
 
 [Hook Overrides]
 clang_format_check: true
diff --git a/TEST_MAPPING b/TEST_MAPPING
index d78c7bd..f4e1ad5 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -4,7 +4,7 @@
       "name": "puffin_unittest"
     }
   ],
-  "hwasan-postsubmit": [
+  "hwasan-presubmit": [
     {
       "name": "puffin_unittest"
     }
diff --git a/src/unittest_common.cc b/src/unittest_common.cc
index ad3a85f..ac050dd 100644
--- a/src/unittest_common.cc
+++ b/src/unittest_common.cc
@@ -4,6 +4,8 @@
 
 #include "puffin/src/unittest_common.h"
 
+#include <unistd.h>
+
 using std::string;
 using std::vector;
 
diff --git a/src/unittest_common.h b/src/unittest_common.h
index eac61e6..8727986 100644
--- a/src/unittest_common.h
+++ b/src/unittest_common.h
@@ -5,6 +5,8 @@
 #ifndef SRC_UNITTEST_COMMON_H_
 #define SRC_UNITTEST_COMMON_H_
 
+#include <unistd.h>
+
 #include <string>
 #include <vector>