version: Remove dash from TARGET_VENDOR_RELEASE_BUILD_ID

This variable is used to build the fingerprint and description on
signed builds, and the dash can't go in there. Add it only when
constructing the final display version variable

Change-Id: I0736d3a88e5f9980c28e6e9afa7e2f9e2d23f815
Merge remote-tracking branch 'upstream/cm-11.0' into berserk