Updating project to work with Android Studio