Revert "libkeymaster1 was split into libkeymaster and _portable"

This reverts commit beee35c850632c3e1b006242122665a84a5fc7f6.

Reason for revert: fix broken build

Change-Id: I60762c834b6837c78027574dda54c5382dbcceec
diff --git a/keymaster/3.0/default/Android.mk b/keymaster/3.0/default/Android.mk
index 2dbb200..9df5bf8 100644
--- a/keymaster/3.0/default/Android.mk
+++ b/keymaster/3.0/default/Android.mk
@@ -11,8 +11,7 @@
     liblog \
     libsoftkeymasterdevice \
     libcrypto \
-    libkeymaster_portable \
-    libkeymaster \
+    libkeymaster1 \
     libhidlbase \
     libhidltransport \
     libutils \