Merge "Move to gradle 3.0, tools 2.2-beta1" into nyc-mr1-dev