signing: Support userdebug-generated display.build.id lines

Change-Id: I3ae608c12a15f6ede2150567662befa7fce763ca
Merge branch 'cm-11.0' of git://github.com/CyanogenMod/android_build into kitkat