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

Change-Id: I237a48e44bb6cef8243328b5befee8dceba9d986