Fixed up build scripts for new installations of Android Studio