Merge "DO NOT MERGE ANYWHERE Move to gradle 3.0, tools 2.2-beta1" into nyc-support-24.1-dev