Roll back to gradle 2.1.2 to fix builds.
am: a990867a8e

Change-Id: Ieabb30f2a7fd2db8bb6c90c95b7707ceb530a3f8