It seems a manual 'make' in the respective directories no longer
works, as always the default distro is used as upstream reference.
Let's work around this by adding DISTRO variable assignments to the
respective makefiles.
Change-Id: I8769d504ca7afde07d4a0ad1f03aaaec892bf576