Revert "Commit before Migration to Android Studio"

This reverts commit 368ea875b3854dae9d00aee5a473c64d3b27c827.