Updating gradle file for new tooling and Android Studio Release