Merge "envsetup: Show error when supplied dir isn\'t present with mmm" am: 475054a16a
am: 3a6ad87039

* commit '3a6ad87039910b7fc7bfb078fec8a66d66441d81':
  envsetup: Show error when supplied dir isn't present with mmm