Fixed build issues in new version of Android Studio