Update buildscript to new build tools and gradle version.
Merge remote-tracking branch 'origin/master'