Revert "Split up main engine from methods"

This reverts commit 2715806b1716baaeff7362d9aa897fbcb535de8c.

Change-Id: I7dfaf2cd97a17913710432007a66fc7df6fcad5d
4 files changed
tree: a2314c7f7d4965e877c24a6e1f1134315344b79a
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/