Merge "DO NOT MERGE ANYWHERE Move to gradle 3.0, tools 2.2-beta1" into nyc-support-24.1-dev
am: 57de32b06e  -s ours

Change-Id: I3dd796045c210825a3c4096ab804ea15424995be