Incorporate RELEASE_BUILD_ID into the build identifier if it exists

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