Upgrade to gradle 2.1

Reviewed at https://reviews.apache.org/r/26113/