Merge "Rename libkeymaster to libkeymaster_staging"
diff --git a/keymaster/3.0/default/Android.mk b/keymaster/3.0/default/Android.mk
index 2dbb200..87ad245 100644
--- a/keymaster/3.0/default/Android.mk
+++ b/keymaster/3.0/default/Android.mk
@@ -12,7 +12,7 @@
     libsoftkeymasterdevice \
     libcrypto \
     libkeymaster_portable \
-    libkeymaster \
+    libkeymaster_staging \
     libhidlbase \
     libhidltransport \
     libutils \