Use same lib versions for Gradle and Maven

Change-Id: I597b477318f6d10f48253da804851c13f4e04f13