setup-mel-builddir: fix the default extramellayers networking layer name

Signed-off-by: Christopher Larson <kergoth@gmail.com>
setup-mel-builddir: when reconfiguring, don't let -x swallow the $MACHINE

Signed-off-by: Christopher Larson <kergoth@gmail.com>