Refactor Event complete.
Refactor Android.mk.