Changed some Android / Gradle configurations (Android build still broken though)