am d36d61be: am abe42666: Move libkeystore to minimal

* commit 'd36d61bec8d728088a300a392b9815555a0203d4':
  Move libkeystore to minimal