Updates necessary after AndroidStudio and gradle update