Switched to Gradle build system and Android Studio