Revert "Merge pull request #7 from agtorre/android"
Revert "Merge pull request #7 from agtorre/android"

This reverts commit f4c594e3fd5ddf30df010c6752a3d0f47911d9db, reversing
changes made to 149d315a32092750a4f9ef6065299416a7d2b140.

agtorre/lifeapp,agtorre/lifeapp