Android Studio build fixes