Bump gradle plugin version and minor changes for build.gradle file

Bump gradle plugin version and minor changes for build.gradle file.