Fixing build issues after migration to Android Studio