Fixing up the build to work with the latest Android Studio