Merge "Keymaster memory management is inconsistent"

Android.bp

@@ -230,6 +230,7 @@ cc_binary {
         "libhidlbase",
         "libhwbinder",
         "libkeymaster4support",
+        "libutils",
     ],
 }
 

Keymaster.h

@@ -115,7 +115,7 @@ class Keymaster {
     bool isSecure();
 
   private:
-    std::unique_ptr<KmDevice> mDevice;
+    sp<KmDevice> mDevice;
     DISALLOW_COPY_AND_ASSIGN(Keymaster);
     static bool hmacKeyGenerated;
 };