Don't make assumptions about the formats of build descriptions

Change-Id: Id83a7594e9e1b9b4ffbdbaba695506d8d0d21a46
(cherry picked from commit 23f2403470359f126643c18fc4c69134f851ceb8)
For user builds, use a release build id in the description if one exists

Companion change to Ic5913e587400dd38c04aa05de3a7becced77a59e

Change-Id: If5edbf56d567701f96f0ba46af9a90ffa8310c24
(cherry picked from commit 57d01d7d674579b27461f99ba9ba923a4dfd6471)
envsetup: Fix remote functions to deal with symlinks

Change-Id: I6f35dc30dda22149b2c37e1c6c7d41ea7239d3bb
(cherry picked from commit 2dc96853332d2c5b7b696123574783292312cc63)