Upgraded project to work with Android Studio 0.8.6