Reorganize system/keymaster.
This CL moves the includes that should be exported to include/ and
removes the trusty-specific code (some of which is moving to
hardware/google and some of which is moving to the trusty tree.)
Change-Id: Ie4fabf6b5c5f36b50c2f5ff356548ca2e9140fcb
diff --git a/google_keymaster_test.cpp b/google_keymaster_test.cpp
index 1b2e22b..3ed0129 100644
--- a/google_keymaster_test.cpp
+++ b/google_keymaster_test.cpp
@@ -21,10 +21,11 @@
#include <openssl/engine.h>
+#include <keymaster/google_keymaster_utils.h>
+#include <keymaster/keymaster_tags.h>
+
#include "google_keymaster_test_utils.h"
-#include "google_keymaster_utils.h"
#include "google_softkeymaster.h"
-#include "keymaster_tags.h"
using std::string;
using std::ifstream;