Updating project to work with Android Studio 1.0 changes