tools: Actually branch on distro name for packages

Change-Id: I0a86ab1bc6d8439d565432107a7823b74334e9be
Merge "tools: Actually branch on distro name for packages" into production