fix Android Studio analysis issues