am bb621b36: Merge "Split up main engine from methods"

* commit 'bb621b36c257ee892e2f07f309cd75b9bae1b613':
  Split up main engine from methods
tree: 23e4992f73ff487062eff977a93e01ebad8c9aa0
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/