Use DISTRO_NAME rather than unbound DISTRO

Also correct case of distro name to match where it is being set.

Change-Id: I05fac5eeaae3593e43355ab7cc7b995d1f46dbdc
Closes-Bug: 1334414
Merge "Use DISTRO_NAME rather than unbound DISTRO"