Changed import ordering
Android Studio and Gradle version updates