Fix exporting the unique build identifier

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