am 5449e457: Merge change I3fb149d2 into eclair

Merge commit '5449e457534a619f7b2aaa008024095023b801ba' into eclair-mr2

* commit '5449e457534a619f7b2aaa008024095023b801ba':
  Remove 'cd top' step from envsetup runtest shortcut.