Revert "Make keystore a core service" am: 44106186ae

Change-Id: I13dd3844579c1fe83a9d23aba486615c61900de4