tree bd24e471902737fba9163d0dc54a3240815c54a4
parent 3aca7a31c4e999141003fb707060e83e0881caf0
author Kenny Root <kroot@google.com> 1372349686 -0700
committer Kenny Root <kroot@google.com> 1372349749 -0700

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

Added missing Android.mk change in this commit.

This reverts commit 1fcabcd3279635e66ceffc42443c5bf0dae69d44.

Change-Id: I71e7fbc8f80a35b4666af985cffb4e7a2eb5634f