Move keystore from user_tags to core req

Move the keystore from the grandfathered list to the new core required
packages.

Change-Id: I61343129c3111cab2d6a1d536775ed9764085281

core/user_tags.mk

@@ -164,7 +164,6 @@ GRANDFATHERED_USER_MODULES += \
 	jsr305lib \
 	junit \
 	jython \
-	keystore \
 	kxml2-2.3.0 \
 	launch-wrapper \
 	layoutlib \

target/product/core.mk

@@ -67,6 +67,8 @@ PRODUCT_PACKAGES := \
     ip-up-vpn \
     ip6tables \
     iptables \
+    keystore \
+    keystore.default \
     libandroidfw \
     libOpenMAXAL \
     libOpenSLES \
@@ -80,6 +82,7 @@ PRODUCT_PACKAGES := \
     libgabi++ \
     libicui18n \
     libicuuc \
+    libkeystore \
     libnativehelper \
     libnfc_ndef \
     libpowermanager \