Merge "hardware/qcom/keymaster: use proper nativehelper headers" am: 3587a1a811
am: 8edff26b02

Change-Id: I8a02d1f9f2429f684cec1f5a94195514891acf85
diff --git a/keymaster_qcom.cpp b/keymaster_qcom.cpp
index ff61319..b7ec9ce 100644
--- a/keymaster_qcom.cpp
+++ b/keymaster_qcom.cpp
@@ -42,7 +42,7 @@
 #include <sys/stat.h>
 #include <dlfcn.h>
 
-#include <UniquePtr.h>
+#include <nativehelper/UniquePtr.h>
 
 #include "QSEEComAPI.h"
 #include "keymaster_qcom.h"