For user builds, use a release build id as the incremental if one exists

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