Updates for Android Studio