Updated android studio, update gradle files to keep it happy