Merge change I3fb149d2 into eclair

* changes:
  Remove 'cd top' step from envsetup runtest shortcut.