Fixing gradle version conflicts

Change-Id: Icf36c314f5cafa7c43771ea8aabec22db743424d
1 file changed