Don't make assumptions about the formats of build descriptions

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