am 3aca7a31: Merge "Revert "Split up main engine from methods""

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