Merge "Move to Android gradle plugin 2.2.0-rc1" into nyc-mr1-dev