Merge "envsetup: Show error when supplied dir isn't present with mmm"