Incorporate TARGET_VENDOR_RELEASE_BUILD_ID into the build identifier if it exists

Change-Id: I24d422abd3817c55cffe17166fb30d7efe48e0a0
cm: Actually add the custom clientidbase

Change-Id: I8105f2cd13c26777f59f1926f378f52c1152cd0d
merge changes from CyanogenMod 10.2 into local branch

Conflicts:
	config/common.mk

Change-Id: I67a95aec9ea00dfbc8dcacf29b2436d7db9d1396
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2