Remove unnecessary dependency on keystore_client

Change-Id: I801740653a6a13cb85d85204e2c8fa1b5ea2f879
(cherry picked from commit 60b72f63f6d36cfc87319bd720a4467fece6a548)
2 files changed