DO NOT MERGE ANYWHERE Move to gradle 3.0, tools 2.2-beta1
am: 98f133dc61  -s ours

Change-Id: I15ef9616bf7ea86dae55648adc6a6272c4dfe71a