Separate keymaster0 and keymaster1 HALs.

Change-Id: I5c54282c12d1c4b8b22ed4929b6e6c724a94ede4
diff --git a/keystore/keyblob_utils.cpp b/keystore/keyblob_utils.cpp
index 9970e8c..3616822 100644
--- a/keystore/keyblob_utils.cpp
+++ b/keystore/keyblob_utils.cpp
@@ -14,10 +14,13 @@
  * limitations under the License.
  */
 
+#include <stdint.h>
 #include <string.h>
 #include <sys/types.h>
 #include <unistd.h>
 
+#include <keystore/keystore.h>
+
 /**
  * When a key is being migrated from a software keymaster implementation
  * to a hardware keymaster implementation, the first 4 bytes of the key_blob