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

Change-Id: I3de685098f6e53949ba2ae33d02702ceab5e8700