Remove unnecessary dependency on keystore_client

Change-Id: I801740653a6a13cb85d85204e2c8fa1b5ea2f879
2 files changed