Fix gradle versions.
am: d861c6d2a3

Change-Id: Ida66c0b2fc05edac7767d31dc619f725cac8c02c