am e2a878e9: Merge "Revert "Revert "Split up main engine from methods"""

* commit 'e2a878e9cd7db48fd9466e19e1fa207a8117319e':
  Revert "Revert "Split up main engine from methods""
tree: 2e997e18bcee6a74feb3b3bd77f686b256ef5063
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/