Update to work with latest Android Studio