Fix build issues with newest version of Android Studio

There was an issue when upgrading from older versions of Android Studio that was preventing the project from building. This pull request should fix that issue. You may need to configure the project to "use customizable gradle wrapper" (Android Studio -> Preferences -> Gradle).

Question: do we want to include the .iml project files under source control? They're currently excluded in the .gitignore.