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

* commit '4c3d8573a3cfb5012396cf009255dd95f1378c40':
  envsetup: Show error when supplied dir isn't present with mmm