Don't make assumptions about the formats of build descriptions

Change-Id: Id83a7594e9e1b9b4ffbdbaba695506d8d0d21a46
(cherry picked from commit 8cff3b51cde077da2ef938a5dcd0b9c457168235)