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

Change-Id: I88865677187654639315993c4b0fb8231287a4a3