Snap for 4373608 from 99dba2d5b0499fd2c8f8ae9d5cf4583a8ac824b8 to pi-release

Change-Id: If5d09813bb0c734ce03e5515c0b81c6d74d98794
diff --git a/tests/scrypt_test.cpp b/tests/scrypt_test.cpp
index 7dfffe3..28f29a0 100644
--- a/tests/scrypt_test.cpp
+++ b/tests/scrypt_test.cpp
@@ -15,7 +15,6 @@
  */
 
 #define LOG_TAG "scrypt_test"
-#include <nativehelper/UniquePtr.h>
 #include <utils/Log.h>
 
 #include <gtest/gtest.h>