Revert "bacon: name the package correctly"

This reverts commit 724feedbd9e668e239e827b974437da85c140313.

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.
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1