Merge "Use canonical UniquePtr.h header"

keymaster/keymaster_tuna.cpp

diff --git a/keymaster/keymaster_tuna.cpp b/keymaster/keymaster_tuna.cpp
index 0868072..15c56f2 100644
--- a/keymaster/keymaster_tuna.cpp
+++ b/keymaster/keymaster_tuna.cpp
@@ -36,7 +36,7 @@
 #include <cryptoki.h>
 #include <pkcs11.h>
 
-#include <utils/UniquePtr.h>
+#include <UniquePtr.h>
 
 
 /** The size of a key ID in bytes */