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

Change-Id: I4ba90ee91d1436c7e87272a0077ec669abf04f51