Some changes to gradle build file for latest Android Studio