Merge "Use support lib to determine build version."
am: 3edd668b1e

Change-Id: I1f976cd1cbd1a88105b2df9050ef817cda58967d