Move keystore from user_tags to core req

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

Change-Id: I61343129c3111cab2d6a1d536775ed9764085281
2 files changed