DO NOT MERGE: [2/2]Try to fix Jenkins package naming, without breaking updater:
Revert "[2/2]Make squasher compatible with Jenkins"
This reverts commit 5654d060af2131365a53dff5fbccb666a6868696.

Change-Id: I13f81e79442c0f6f680cf08e746d77251cac25e7
My changes