Fix some Gradle stuff to appease the Android Studio gods