Updates for newer version of Android Studio