mkvendor.sh: more fixes

Change-Id: I0c641d42a96e44bb9170475d5de21cb8644e4d3d