Fix #2840: Build collision for single-package and FILE_FULL_PATH ...

By including the package path in the buildid we avoid the problem,
at the expense of not sharing the cache for packages that could be
shared, but we would need to know if the code depends on __FILE__
and __FILE_FULL_PATH__ or not.