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

Change-Id: I15108b6e764a8414e1f276174b4f8ae87d2ca8ea