DO NOT MERGE: [1/2]Try to fix Jenkins package naming, without breaking updater

Change-Id: Iff79909d4cdbc5a90994ae4849ac9d4eeca0b4ab
[WIP]: New changes needed for msm-3.5 clang

Change-Id: If41682c7265645056be757e58eb14b8707ce7438