Remove dependency on keyring

I don't see this used anywhere, so lets drop the
dependency.

Change-Id: Icf14648ad7e82a05d942f53fe38e9757aece691c
Merge "Remove dependency on keyring"