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

Change-Id: I1d772fda371122070f569de90fe417ce1428d55c