Unify version definition

Change-Id: Ib4d890a49dbd44886df2e19877d94d7b97e46868