Fix gradle versions. am: d861c6d2a3 am: 26f16a4975
am: fee6727112

Change-Id: I57e27c08d9efc639169361a4b57488e4b39908a0