am 89e8bad0: am 7627a373: am 5449e457: Merge change I3fb149d2 into eclair

Merge commit '89e8bad0cf3f70bcf61809c6078001451a181b4a'

* commit '89e8bad0cf3f70bcf61809c6078001451a181b4a':
  Remove 'cd top' step from envsetup runtest shortcut.