Fix exporting the unique build identifier

Change-Id: Ie58e981b7e83a4351d137dfd8995dce7d365d950
build: merge CyanogenMod

Change-Id: I731d858bf71e1fcd3f3dde8ad8ede968e629435f