Previously it tried to use a BUILDID Make variable that did not exist.

Change-Id: Ie31eb3928c69dc52fcb17a9a5593cbe166d95307