Merge "Revert "Split up main engine from methods""
tree: a2314c7f7d4965e877c24a6e1f1134315344b79a
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/