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

Change-Id: I159479172c140daef4495697856adf2fb035d327