Moved to a stable version of gradle plugin for nyc-dev branch.
am: 2d0dd2ac0b  -s ours

Change-Id: I52cea660c5f0d9176a59d19f6fbf2dd0d8b39d0f