Fixing gradle version comflicts

Change-Id: I6e3b99e2ad67a192e29f9939fc188db81f31d219
1 file changed