Use libkeymaster4support in keystore.

Test: CTS
Change-Id: Iee8f308a5255a03b02fce162cc4184d45f75fd1b
diff --git a/keystore/KeyStore.h b/keystore/KeyStore.h
index 60cf56d..463ed8e 100644
--- a/keystore/KeyStore.h
+++ b/keystore/KeyStore.h
@@ -21,10 +21,11 @@
 
 #include <utils/Vector.h>
 
+#include <keystore/keymaster_types.h>
+
 #include "Keymaster.h"
 #include "blob.h"
 #include "grant_store.h"
-#include "include/keystore/keymaster_tags.h"
 #include "user_state.h"
 
 namespace keystore {