Merge "move to 2.2-beta2 and local gradle3 prebuilt" into nyc-mr1-dev