Revert "bacon: name the package correctly"

This reverts commit 724feedb.

This breaks package naming, since a build.prop from a previous build
can be present before the cleanup rules apply, and this is variable
is generated before the build actually begins.
Most notably, this happens in jenkins with consecutive builds, even if
from different projects and tags.