Split libkeymaster1 into libkeymaster and libkeymaster_portable

Also removed unused include

Test: trivial
Change-Id: I37122aead5b60be8dd0697afa22489532d314b9c
diff --git a/keystore/Android.mk b/keystore/Android.mk
index 8231bf1..c6b65da 100644
--- a/keystore/Android.mk
+++ b/keystore/Android.mk
@@ -57,7 +57,8 @@
 	libselinux \
 	libsoftkeymasterdevice \
 	libkeymaster_messages \
-	libkeymaster1 \
+	libkeymaster_portable \
+	libkeymaster \
 	libhwbinder \
 	libhidlbase \
 	libhidltransport \