Update gradle plugin

Please cherry pick this commit onto your master branch :)