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

Change-Id: Ib59aa29c263c20406d6ea5fd46d2830e8c9fc614