Update Gradle build to use build tools 21.1.1
Merge remote-tracking branch 'origin/master'