Incorporate TARGET_VENDOR_RELEASE_BUILD_ID into the build identifier if it exists

Change-Id: I24d422abd3817c55cffe17166fb30d7efe48e0a0
merge CyanogenMod

Change-Id: I800e54f311c64f627a567a6ad8077be12f69d6d4