Revert "Merge branch 'master' of https://github.com/thowi/birthdroid"

This reverts commit 99784f12af65340f0985d0452a99eb7b0c80519e, reversing
changes made to ed526a6691a159c2e1eb0f7f9723030663873a1b.
Some Eclipse fixes.