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

Change-Id: Ifb97df19753cef878d21034374fab1bb9a0dba40