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