Revert "Revert "Split up main engine from methods""

Added missing Android.mk change in this commit.

This reverts commit 1fcabcd3279635e66ceffc42443c5bf0dae69d44.

Change-Id: I71e7fbc8f80a35b4666af985cffb4e7a2eb5634f
5 files changed
tree: bd24e471902737fba9163d0dc54a3240815c54a4
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/