making envsetup comfortable for the gerrit change

Change-Id: I4e27d51cca5620f6f5f0d4d24f57028c067b8fd0