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

Merge commit '7627a373f393e379a7fb80da8ea84081692db823' into eclair-mr2-plus-aosp

* commit '7627a373f393e379a7fb80da8ea84081692db823':
  Remove 'cd top' step from envsetup runtest shortcut.